commit gnome-main-menu

26 Oct 2006

Hello community,

here is the log from the commit of package gnome-main-menu
checked in at Thu Oct 26 20:14:33 CEST 2006.

--------

--- GNOME/gnome-main-menu/gnome-main-menu.changes	2006-10-24 03:11:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes	2006-10-25 19:10:47.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Oct 25 19:10:20 CEST 2006 - jimmyk@suse.de
+
+- Removed libgnomesu and gnome-terminal from the Requires portion of the .spec.
+
+-------------------------------------------------------------------
+Tue Oct 24 19:24:25 CEST 2006 - sreeves@suse.de
+
+- Fix for #214705 - AB/CC do not support menu layout hints.
+  Add missing header files to gnome-main-menu-devel
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-main-menu.spec ++++++
--- /var/tmp/diff_new_pack.XRCwXz/_old	2006-10-26 20:14:28.000000000 +0200
+++ /var/tmp/diff_new_pack.XRCwXz/_new	2006-10-26 20:14:28.000000000 +0200
@@ -18,13 +18,13 @@
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 Version:        0.6.3
-Release:        12
+Release:        20
 Summary:        The GNOME Desktop Menu
 Source:         %{name}-%{version}.tar.gz
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         filesystem gconf2
-Requires:       gnome-panel dbus-1-glib hal tango-icon-theme libgnomesu gnome-terminal gnome-system-monitor wireless-tools
+Requires:       gnome-panel dbus-1-glib hal tango-icon-theme gnome-system-monitor wireless-tools
 Recommends:	zen-updater
 
 %description
@@ -137,6 +137,11 @@
 %{prefix}/include/tile
 
 %changelog -n gnome-main-menu
+* Wed Oct 25 2006 - jimmyk@suse.de
+- Removed libgnomesu and gnome-terminal from the Requires portion of the .spec.
+* Tue Oct 24 2006 - sreeves@suse.de
+- Fix for #214705 - AB/CC do not support menu layout hints.
+  Add missing header files to gnome-main-menu-devel
 * Tue Oct 24 2006 - jimmyk@suse.de
 - Updated to work with both the ~/.recently-used.xbel and the old
   ~/.recently-used file formats.  BNC #208368.

++++++ gnome-main-menu-0.6.3.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/libslab/app-shell.c new/gnome-main-menu-0.6.3/libslab/app-shell.c
--- old/gnome-main-menu-0.6.3/libslab/app-shell.c	2006-09-16 01:02:11.000000000 +0200
+++ new/gnome-main-menu-0.6.3/libslab/app-shell.c	2006-10-24 19:05:02.000000000 +0200
@@ -832,8 +832,9 @@
 				data = g_new0 (CategoryData, 1);
 				data->category = g_strdup (category);
 				app_data->categories_list =
-					g_list_insert_sorted (app_data->categories_list, data,
-					category_data_compare);
+					/* use the gmenu order instead of alphabetical */
+					g_list_insert (app_data->categories_list, data, -1);
+					/* g_list_insert_sorted (app_data->categories_list, data, category_data_compare); */
 			}
 			else
 			{
@@ -1165,12 +1166,14 @@
 	/* destroyed when they are removed */
 	g_object_ref (launcher);
 
+	/* use alphabetical order instead of the gmenu order. We group all sub items in each top level
+	category together, ignoring sub menus, so we also ignore sub menu layout hints */
 	cat_data->launcher_list =
-		g_list_insert_sorted (cat_data->launcher_list, launcher,
-		application_launcher_compare);
+		/* g_list_insert (cat_data->launcher_list, launcher, -1); */
+		g_list_insert_sorted (cat_data->launcher_list, launcher, application_launcher_compare);
 	cat_data->filtered_launcher_list =
-		g_list_insert_sorted (cat_data->filtered_launcher_list, launcher,
-		application_launcher_compare);
+		/* g_list_insert (cat_data->filtered_launcher_list, launcher, -1); */
+		g_list_insert_sorted (cat_data->filtered_launcher_list, launcher, application_launcher_compare);
 }
 
 static gint
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/libslab/libslab.pc.in new/gnome-main-menu-0.6.3/libslab/libslab.pc.in
--- old/gnome-main-menu-0.6.3/libslab/libslab.pc.in	2006-06-26 16:11:52.000000000 +0200
+++ new/gnome-main-menu-0.6.3/libslab/libslab.pc.in	2006-10-24 18:01:01.000000000 +0200
@@ -7,5 +7,5 @@
 Description: Beautiful App Slab
 Requires: glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango
 Version: @VERSION@
-Libs: -L${libdir} -lslab
-Cflags: -I${includedir}/slab
+Libs: -L${libdir} -lslab -ltile
+Cflags: -I${includedir}/slab -I${includedir}/tile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/libslab/nld-marshal.c new/gnome-main-menu-0.6.3/libslab/nld-marshal.c
--- old/gnome-main-menu-0.6.3/libslab/nld-marshal.c	2006-10-23 22:07:37.000000000 +0200
+++ new/gnome-main-menu-0.6.3/libslab/nld-marshal.c	2006-10-24 18:41:11.000000000 +0200
@@ -48,7 +48,7 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* VOID:INT,STRING (/home/jimmyk/slab/gnome-cvs/slab/libslab/nld-marshal.list:1) */
+/* VOID:INT,STRING (./nld-marshal.list:1) */
 void
 nld_marshal_VOID__INT_STRING (GClosure     *closure,
                               GValue       *return_value,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/libslab/nld-marshal.h new/gnome-main-menu-0.6.3/libslab/nld-marshal.h
--- old/gnome-main-menu-0.6.3/libslab/nld-marshal.h	2006-10-23 22:07:37.000000000 +0200
+++ new/gnome-main-menu-0.6.3/libslab/nld-marshal.h	2006-10-24 18:41:11.000000000 +0200
@@ -6,7 +6,7 @@
 
 G_BEGIN_DECLS
 
-/* VOID:INT,STRING (/home/jimmyk/slab/gnome-cvs/slab/libslab/nld-marshal.list:1) */
+/* VOID:INT,STRING (./nld-marshal.list:1) */
 extern void nld_marshal_VOID__INT_STRING (GClosure     *closure,
                                           GValue       *return_value,
                                           guint         n_param_values,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/utils/Makefile.am new/gnome-main-menu-0.6.3/utils/Makefile.am
--- old/gnome-main-menu-0.6.3/utils/Makefile.am	2006-10-23 21:44:53.000000000 +0200
+++ new/gnome-main-menu-0.6.3/utils/Makefile.am	2006-10-24 18:01:22.000000000 +0200
@@ -4,6 +4,11 @@
 
 noinst_LTLIBRARIES = libutils.la
 
+libutils_includedir = $(includedir)/slab
+libutils_include_HEADERS =			\
+	gnome-utils.h				\
+	slab-gnome-util.h			
+
 libutils_la_SOURCES =			\
 	double-click-detector.c		\
 	double-click-detector.h		\
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-main-menu-0.6.3/utils/Makefile.in new/gnome-main-menu-0.6.3/utils/Makefile.in
--- old/gnome-main-menu-0.6.3/utils/Makefile.in	2006-10-24 01:56:13.000000000 +0200
+++ new/gnome-main-menu-0.6.3/utils/Makefile.in	2006-10-24 18:40:06.000000000 +0200
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -37,7 +38,8 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = utils
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(libutils_include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -64,6 +66,15 @@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libutils_la_SOURCES)
 DIST_SOURCES = $(libutils_la_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(libutils_includedir)"
+libutils_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+HEADERS = $(libutils_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -244,6 +255,11 @@
 	$(WARN_CFLAGS)
 
 noinst_LTLIBRARIES = libutils.la
+libutils_includedir = $(includedir)/slab
+libutils_include_HEADERS = \
+	gnome-utils.h				\
+	slab-gnome-util.h			
+
 libutils_la_SOURCES = \
 	double-click-detector.c		\
 	double-click-detector.h		\
@@ -355,6 +371,23 @@
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-libutils_includeHEADERS: $(libutils_include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libutils_includedir)" || $(mkdir_p) "$(DESTDIR)$(libutils_includedir)"
+	@list='$(libutils_include_HEADERS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(libutils_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libutils_includedir)/$$f'"; \
+	  $(libutils_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libutils_includedir)/$$f"; \
+	done
+
+uninstall-libutils_includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libutils_include_HEADERS)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(libutils_includedir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libutils_includedir)/$$f"; \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -433,8 +466,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
+	for dir in "$(DESTDIR)$(libutils_includedir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -480,7 +516,7 @@
 
 info-am:
 
-install-data-am:
+install-data-am: install-libutils_includeHEADERS
 
 install-exec-am:
 
@@ -508,19 +544,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-libutils_includeHEADERS
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	install-exec-am install-info install-info-am \
+	install-libutils_includeHEADERS install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-libutils_includeHEADERS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)