From b23b63cdd554286d02b1a09353a946f3bc40f16a Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 27 Jul 2007 18:15:31 +0000 Subject: Split the UI part of sugarext out to his own module to avoid dragging gtk inside services. --- (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 445307e..55298bf 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,51 +1,21 @@ -SUBDIRS = xdgmime +SUBDIRS = ui -libsugar_la_CPPFLAGS = \ - $(LIB_CFLAGS) - -noinst_LTLIBRARIES = libsugar.la - -libsugar_la_LIBADD = \ - $(LIB_LIBS) \ - $(top_builddir)/lib/xdgmime/libxdgmime.la - -libsugar_la_SOURCES = \ - $(BUILT_SOURCES) \ - eggaccelerators.c \ - eggaccelerators.h \ - sugar-address-entry.c \ - sugar-address-entry.h \ - sugar-key-grabber.c \ - sugar-key-grabber.h \ - sugar-menu.h \ - sugar-menu.c \ - sugar-x11-util.c \ - sugar-x11-util.h - -BUILT_SOURCES = \ - sugar-marshal.c \ - sugar-marshal.h +INCLUDES = -DXDG_PREFIX=sugar_mime -stamp_files = \ - stamp-sugar-marshal.c \ - stamp-sugar-marshal.h - -sugar-marshal.c: stamp-sugar-marshal.c - @true -stamp-sugar-marshal.c: sugar-marshal.list - $(GLIB_GENMARSHAL) --prefix=sugar_marshal \ - $(srcdir)/sugar-marshal.list --header --body > \ - sugar-marshal.c && echo timestamp > $(@F) - -sugar-marshal.h: stamp-sugar-marshal.h - @true -stamp-sugar-marshal.h: sugar-marshal.list - $(GLIB_GENMARSHAL) --prefix=sugar_marshal \ - $(srcdir)/sugar-marshal.list --header > \ - sugar-marshal.h && echo timestamp > $(@F) - -CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) +noinst_LTLIBRARIES = libsugar.la -EXTRA_DIST = sugar-marshal.list +libsugar_la_SOURCES = \ + xdgmime.c \ + xdgmime.h \ + xdgmimealias.c \ + xdgmimealias.h \ + xdgmimecache.c \ + xdgmimecache.h \ + xdgmimeglob.c \ + xdgmimeglob.h \ + xdgmimeint.c \ + xdgmimeint.h \ + xdgmimemagic.c \ + xdgmimemagic.h \ + xdgmimeparent.c \ + xdgmimeparent.h diff --git a/lib/ui/Makefile.am b/lib/ui/Makefile.am new file mode 100644 index 0000000..3640a08 --- /dev/null +++ b/lib/ui/Makefile.am @@ -0,0 +1,48 @@ +libsugarui_la_CPPFLAGS = \ + $(LIB_CFLAGS) + +noinst_LTLIBRARIES = libsugarui.la + +libsugarui_la_LIBADD = \ + $(LIB_LIBS) + +libsugarui_la_SOURCES = \ + $(BUILT_SOURCES) \ + eggaccelerators.c \ + eggaccelerators.h \ + sugar-address-entry.c \ + sugar-address-entry.h \ + sugar-key-grabber.c \ + sugar-key-grabber.h \ + sugar-menu.h \ + sugar-menu.c \ + sugar-x11-util.c \ + sugar-x11-util.h + +BUILT_SOURCES = \ + sugar-marshal.c \ + sugar-marshal.h + +stamp_files = \ + stamp-sugar-marshal.c \ + stamp-sugar-marshal.h + +sugar-marshal.c: stamp-sugar-marshal.c + @true +stamp-sugar-marshal.c: sugar-marshal.list + $(GLIB_GENMARSHAL) --prefix=sugar_marshal \ + $(srcdir)/sugar-marshal.list --header --body > \ + sugar-marshal.c && echo timestamp > $(@F) + +sugar-marshal.h: stamp-sugar-marshal.h + @true +stamp-sugar-marshal.h: sugar-marshal.list + $(GLIB_GENMARSHAL) --prefix=sugar_marshal \ + $(srcdir)/sugar-marshal.list --header > \ + sugar-marshal.h && echo timestamp > $(@F) + +CLEANFILES = $(stamp_files) $(BUILT_SOURCES) +DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) +MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) + +EXTRA_DIST = sugar-marshal.list diff --git a/lib/eggaccelerators.c b/lib/ui/eggaccelerators.c index 0a39d51..0a39d51 100644 --- a/lib/eggaccelerators.c +++ b/lib/ui/eggaccelerators.c diff --git a/lib/eggaccelerators.h b/lib/ui/eggaccelerators.h index d2276d2..d2276d2 100644 --- a/lib/eggaccelerators.h +++ b/lib/ui/eggaccelerators.h diff --git a/lib/sugar-address-entry.c b/lib/ui/sugar-address-entry.c index 1f8c983..1f8c983 100644 --- a/lib/sugar-address-entry.c +++ b/lib/ui/sugar-address-entry.c diff --git a/lib/sugar-address-entry.h b/lib/ui/sugar-address-entry.h index 60c56ab..60c56ab 100644 --- a/lib/sugar-address-entry.h +++ b/lib/ui/sugar-address-entry.h diff --git a/lib/sugar-key-grabber.c b/lib/ui/sugar-key-grabber.c index baddab5..baddab5 100644 --- a/lib/sugar-key-grabber.c +++ b/lib/ui/sugar-key-grabber.c diff --git a/lib/sugar-key-grabber.h b/lib/ui/sugar-key-grabber.h index 5b734e7..5b734e7 100644 --- a/lib/sugar-key-grabber.h +++ b/lib/ui/sugar-key-grabber.h diff --git a/lib/sugar-marshal.list b/lib/ui/sugar-marshal.list index 41ce620..41ce620 100644 --- a/lib/sugar-marshal.list +++ b/lib/ui/sugar-marshal.list diff --git a/lib/sugar-menu.c b/lib/ui/sugar-menu.c index a7e6635..a7e6635 100644 --- a/lib/sugar-menu.c +++ b/lib/ui/sugar-menu.c diff --git a/lib/sugar-menu.h b/lib/ui/sugar-menu.h index 24e2865..24e2865 100644 --- a/lib/sugar-menu.h +++ b/lib/ui/sugar-menu.h diff --git a/lib/sugar-x11-util.c b/lib/ui/sugar-x11-util.c index b57d051..b57d051 100644 --- a/lib/sugar-x11-util.c +++ b/lib/ui/sugar-x11-util.c diff --git a/lib/sugar-x11-util.h b/lib/ui/sugar-x11-util.h index 54655a9..54655a9 100644 --- a/lib/sugar-x11-util.h +++ b/lib/ui/sugar-x11-util.h diff --git a/lib/xdgmime/xdgmime.c b/lib/xdgmime.c index 1d2007c..1d2007c 100644 --- a/lib/xdgmime/xdgmime.c +++ b/lib/xdgmime.c diff --git a/lib/xdgmime/xdgmime.h b/lib/xdgmime.h index d8172be..d8172be 100644 --- a/lib/xdgmime/xdgmime.h +++ b/lib/xdgmime.h diff --git a/lib/xdgmime/ChangeLog b/lib/xdgmime/ChangeLog deleted file mode 100644 index d04c59a..0000000 --- a/lib/xdgmime/ChangeLog +++ /dev/null @@ -1,378 +0,0 @@ -2007-01-22 Matthias Clasen - - * === 2.10.9 === - -2007-01-17 Matthias Clasen - - * === Released 2.10.8 === - -2007-01-07 Matthias Clasen - - * xdgmimecache.c (cache_glob_node_lookup_suffix): Don't return "" - as match. (fd.o #9544, Yevgen Muntyan) - -2007-01-07 Matthias Clasen - - * xdgmimecache.c (_xdg_mime_cache_list_mime_parents): Fix - several problems with this function. (fd.o #9560, Yevgen Muntyan) - -2007-01-05 Matthias Clasen - - * === Released 2.10.7 === - -2006-10-03 Matthias Clasen - - * === Released 2.10.6 === - -2006-10-02 Matthias Clasen - - * === Released 2.10.5 === - -2006-09-22 Matthias Clasen - - * === Released 2.10.4 === - -2006-09-04 Matthias Clasen - - * === Released 2.10.3 === - -2006-08-17 Matthias Clasen - - * === Released 2.10.2 === - -2006-07-23 Matthias Clasen - - * === Released 2.10.1 === - -2006-07-20 Matthias Clasen - - Fix a thinko that leads to constantly reloading - the mime data if a mime.cache is present. Patch - by Yevgen Muntyan, bugs.freedesktop.org #7495 - - * xdgmime.c (xdg_check_dir): Look for mime.cache first. - (xdg_check_file): Report existance of the file separately. - -2006-07-20 Matthias Clasen - - * xdgmime.c (xdg_mime_shutdown): Unref the caches. - Patch by Yevgen Muntyan, bugs.freedesktop.org #7496 - - * xdgmimemagic.c: - * xdgmime.c: - * xdgmime.h: Add xdg_init-free versions of some - functions and use them internally, so that we don't - reload caches and clobber data structures in the - middle of an operation. Patch by Joe Shaw, - bugs.freedesktop.org #6824 - -2006-07-19 Matthias Clasen - - * xdgmimeglob.c (_xdg_glob_hash_node_lookup_file_name): - Don't return NULL as a mimetype, ever, patch - by Yevgen Muntyan, bugs.freedesktop.org #5241 - -2006-07-02 Matthias Clasen - - * === Released 2.10.0 === - -2006-06-21 Matthias Clasen - - * === Released 2.9.4 === - -2006-06-12 Matthias Clasen - - * === Released 2.9.3 === - -2006-06-05 Matthias Clasen - - * === Released 2.9.2 === - -2006-05-16 Matthias Clasen - - * === Released 2.9.1 ==== - -2006-05-04 Matthias Clasen - - * === Released 2.9.0 === - -2006-04-03 Matthias Clasen - - * xdgmime.[hc]: Move xdg_mime_type_unknown to .rodata. - -2006-03-06 Matthias Clasen - - * xdgmimemagic.c: Remove superfluous extern errno - declaration. (#333605, Tommi Komulainen) - -2006-02-27 Matthias Clasen - - * xdgmime.h (xdg_mime_dump): Don't export xdg_mime_dump. - -2005-12-01 Matthias Clasen - - * Merge upstream changes to handle duplicate glob - patterns. - -2005-11-04 Matthias Clasen - - * xdgmime.c (xdg_mime_list_mime_parents): Prevent - a segfault. - -2005-10-18 Matthias Clasen - - * xdgmimecache.c: Make magic comparisons work correctly - in the cache. - -2005-10-17 Matthias Clasen - - * xdgmime.c (xdg_mime_get_mime_type_for_file): Remove - a debugging printf. - -2005-09-01 Matthias Clasen - - * xdgmime.h: - * xdgmime.c (xdg_mime_get_mime_type_for_file): Take - a struct statbuf * as argument. - - * test-mime.c (main): Adjust. - -2005-08-24 Matthias Clasen - - * === Released 2.8.2 === - - * === Released 2.8.1 === - -2005-08-13 Matthias Clasen - - * === Released 2.8.0 === - -2005-08-07 Matthias Clasen - - * Rename caches to _caches, so it doesn't - get exported. Also don't export n_caches. - -2005-08-02 Matthias Clasen - - * === Released 2.7.5 === - -2005-07-22 Matthias Clasen - - * === Released 2.7.4 === - -2005-07-15 Matthias Clasen - - * === Released 2.7.3 === - -2005-07-08 Matthias Clasen - - * === Released 2.7.2 === - -2005-07-01 Matthias Clasen - - * === Released 2.7.1 === - -2005-06-20 Matthias Clasen - - * xdgmimecache.c: Handle missing MAP_FAILED. (#308449, Georg - Schwarz) - -2005-06-20 Matthias Clasen - - * === Released 2.7.0 === - -2005-06-10 Federico Mena Quintero - - * xdgmime.c (xdg_mime_init_from_directory): Pass the correct size - to realloc(). Fixes https://bugs.freedesktop.org/show_bug.cgi?id=3506. - -2005-06-09 Matthias Clasen - - * xdgmimemagic.c: Don't declare errno, including errno.h - is enough. (#304164, Joerg Sonnenberger) - -2005-05-20 Matthias Clasen - - * xdgmimecache.c (GET_UINT32): Don't rely on C99 - types. (#304924, John Ehresman) - -2005-04-29 Matthias Clasen - - * Sync to upstream. - -2005-04-08 Matthias Clasen - - * xdgmimecache.c (cache_magic_matchlet_compare_to_data) - (cache_magic_matchlet_compare): Use cache->buffer, not - cache. - -Tue Apr 5 16:00:04 2005 Manish Singh - - * Makefile.am: add xdgmimecache.[ch]. - -2005-03-28 Matthias Clasen - - * xdgmimeglob.c: Sync to latest upstream, - including fixes for matching against multiple - extensions (eg .tar.gz) and for suffix - patterns which don't start with a dot. - -Sat Mar 19 23:52:33 2005 Manish Singh - - * xdgmimeglob.c (_xdg_glob_hash_insert_text): cast away the constness - in the call to free(). - -2005-03-20 Matthias Clasen - - * xdgmimeglob.c (_xdg_glob_hash_insert_text): Don't - leak node->mime_type if we are reusing an existing - node. (#170774, Kjartan Maraas) - -2005-01-08 Matthias Clasen - - * === Released 2.6.1 === - -2004-12-16 Matthias Clasen - - * === Released 2.6.0 === - -2004-12-13 Marco Pesenti Gritti - - * xdgmimeglob.c: (_xdg_glob_hash_lookup_file_name): - - Resync with upstream again - -Fri Dec 10 13:58:38 2004 Manish Singh - - * xdgmime.h: wrap new API in XDG_ENTRY(). - -2004-12-09 Marco Pesenti Gritti - - * xdgmime.c: (xdg_mime_unalias_mime_type), - (xdg_mime_mime_type_equal), (xdg_mime_mime_type_subclass), - (xdg_mime_get_mime_parents): - * xdgmime.h: - * xdgmimealias.c: (_xdg_mime_alias_list_lookup): - * xdgmimeglob.c: (_xdg_glob_hash_node_lookup_file_name): - * xdgmimeint.c: (_xdg_ucs4_to_lower): - * xdgmimeint.h: - * xdgmimemagic.c: (_xdg_mime_magic_read_from_file): - * xdgmimeparent.c: (_xdg_mime_parent_list_lookup): - - Resync with upstream - -2004-12-09 Matthias Clasen - - * xdgmimealias.c (_xdg_mime_alias_read_from_file): - * xdgmimeparent.c (_xdg_mime_parent_read_from_file): Make - repeated calls accumulate the results, don't call qsort() - on empty arrays. (#160838, Mariano Suárez-Alvarez) - -2004-12-02 Matthias Clasen - - * === Released 2.5.6 === - -2004-11-29 Matthias Clasen - - * xdgmimeparent.c (_xdg_mime_parent_list_lookup): - * xdgmimealias.c (_xdg_mime_alias_list_lookup): Protect - against stupid bsearch() implementations. (#159737, - Morten Welinder) - -2004-11-24 Matthias Clasen - - * xdgmimeparent.c (_xdg_mime_parent_read_from_file): - Initialize the parent field of the newly allocate list - entry. (#159330, Alex Larsson) - -Fri Nov 19 15:10:32 2004 Manish Singh - - * xdgmime.c: Don't put /* within a comment. - -2004-11-09 Matthias Clasen - - * xdgmime.h: Prefix all symbols. - -2004-11-08 Matthias Clasen - - * xdgmime.c (xdg_mime_mime_type_subclass): Enable matching - of supertypes as text/*. - - * Sync from upstream - -2004-10-27 Matthias Clasen - - * === Released 2.5.4 === - -2004-09-19 Matthias Clasen - - * === Released 2.5.3 === - -2004-08-25 Matthias Clasen - - * === Released 2.5.2 === - -Wed Aug 11 20:44:35 2004 Matthias Clasen - - * xdgmime.h (xdg_mime_shutdown): Add the XDG_PREFIX to - this function as well. - -2004-08-01 Matthias Clasen - - * === Released 2.5.1 === - -Tue Jul 20 22:24:35 2004 Matthias Clasen - - * xdgmimeglob.h: Remove trailing commas from - enumerations. (#148035) - -Sun Jul 18 20:17:41 2004 Soeren Sandmann - - * === Released 2.5.0 == - -Thu May 27 15:23:17 2004 Jonathan Blandford - - * Sync from upstream - -Fri Apr 30 00:19:11 2004 Matthias Clasen - - * xdgmimemagic.c (_xdg_mime_magic_read_a_number): Make sure - the static string is long enough. (#136323, Morten Welinder) - -2004-03-12 Morten Welinder - - * *.c: Make sure to include (#137001) - -Wed Mar 10 22:48:15 2004 Jonathan Blandford - - * Sync from upstream - -Sun Feb 8 19:05:16 2004 Manish Singh - - * xdgmimeint.h: declare _xdg_utf8_skip as extern to prevent multiple - definitions. - -Wed Jan 21 09:33:13 2004 Jonathan Blandford - - * libgnomevfs/xdgmimeglob.c: - * libgnomevfs/xdgmimemagic.c: Sync from upstream - -Tue Jan 20 13:07:04 2004 Jonathan Blandford - - * xdgmime.c: resync with upstream sources. - -Fri Oct 24 16:54:57 2003 Owen Taylor - - * Makefile.am (libxdgmime_la_SOURCES): Add .h files to - SOURCES. - -Fri Oct 24 16:02:32 2003 Owen Taylor - - * *.[ch]: Relicense to be dual AFL/LGPL (and thus also - GPL) rather than AFL/GPL. Also update AFL version to 1.2. - -Tue Jul 22 15:37:45 2003 Jonathan Blandford - - * xdgmime/xdgmime.c (xdg_mime_init): use XDG_DATA_HOME instead of - XDG_CONFIG_HOME. - diff --git a/lib/xdgmime/Makefile.am b/lib/xdgmime/Makefile.am deleted file mode 100644 index 3cf173d..0000000 --- a/lib/xdgmime/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = -DXDG_PREFIX=sugar_mime - -noinst_LTLIBRARIES = libxdgmime.la - -libxdgmime_la_SOURCES = \ - xdgmime.c \ - xdgmime.h \ - xdgmimealias.c \ - xdgmimealias.h \ - xdgmimecache.c \ - xdgmimecache.h \ - xdgmimeglob.c \ - xdgmimeglob.h \ - xdgmimeint.c \ - xdgmimeint.h \ - xdgmimemagic.c \ - xdgmimemagic.h \ - xdgmimeparent.c \ - xdgmimeparent.h diff --git a/lib/xdgmime/xdgmimealias.c b/lib/xdgmimealias.c index 2dd70f1..2dd70f1 100644 --- a/lib/xdgmime/xdgmimealias.c +++ b/lib/xdgmimealias.c diff --git a/lib/xdgmime/xdgmimealias.h b/lib/xdgmimealias.h index 3df18d6..3df18d6 100644 --- a/lib/xdgmime/xdgmimealias.h +++ b/lib/xdgmimealias.h diff --git a/lib/xdgmime/xdgmimecache.c b/lib/xdgmimecache.c index 8804eab..8804eab 100644 --- a/lib/xdgmime/xdgmimecache.c +++ b/lib/xdgmimecache.c diff --git a/lib/xdgmime/xdgmimecache.h b/lib/xdgmimecache.h index 61793cb..61793cb 100644 --- a/lib/xdgmime/xdgmimecache.h +++ b/lib/xdgmimecache.h diff --git a/lib/xdgmime/xdgmimeglob.c b/lib/xdgmimeglob.c index 95d9587..95d9587 100644 --- a/lib/xdgmime/xdgmimeglob.c +++ b/lib/xdgmimeglob.c diff --git a/lib/xdgmime/xdgmimeglob.h b/lib/xdgmimeglob.h index 25a1f20..25a1f20 100644 --- a/lib/xdgmime/xdgmimeglob.h +++ b/lib/xdgmimeglob.h diff --git a/lib/xdgmime/xdgmimeint.c b/lib/xdgmimeint.c index 4a0ac4c..4a0ac4c 100644 --- a/lib/xdgmime/xdgmimeint.c +++ b/lib/xdgmimeint.c diff --git a/lib/xdgmime/xdgmimeint.h b/lib/xdgmimeint.h index 2881487..2881487 100644 --- a/lib/xdgmime/xdgmimeint.h +++ b/lib/xdgmimeint.h diff --git a/lib/xdgmime/xdgmimemagic.c b/lib/xdgmimemagic.c index 6088edb..6088edb 100644 --- a/lib/xdgmime/xdgmimemagic.c +++ b/lib/xdgmimemagic.c diff --git a/lib/xdgmime/xdgmimemagic.h b/lib/xdgmimemagic.h index 1657896..1657896 100644 --- a/lib/xdgmime/xdgmimemagic.h +++ b/lib/xdgmimemagic.h diff --git a/lib/xdgmime/xdgmimeparent.c b/lib/xdgmimeparent.c index 511bbac..511bbac 100644 --- a/lib/xdgmime/xdgmimeparent.c +++ b/lib/xdgmimeparent.c diff --git a/lib/xdgmime/xdgmimeparent.h b/lib/xdgmimeparent.h index da29452..da29452 100644 --- a/lib/xdgmime/xdgmimeparent.h +++ b/lib/xdgmimeparent.h -- cgit v0.9.1