GNOME.org
 

quick lounge build error and mini-commander crash in garnome 0.18.2

Hye

I ran into a build problem with quick-lounge-applet and a crash with
mini-commander.
Quick-lounge seems to be in a "not ported state" for gnome-2.1 (make use
of GnomeIconLoader instead of GnomeIconTheme).
I attached two simple patches to fix (one for garnome and one on its own)
For mini-commander some data (MCData) is used before being allocated.
There is also two patches.



diff -Nru tmp/quick-lounge-applet-0.96/src/Makefile.am work/quick-lounge-applet-0.96/src/Makefile.am
--- tmp/quick-lounge-applet-0.96/src/Makefile.am	Tue Oct 15 11:42:51 2002
+++ work/quick-lounge-applet-0.96/src/Makefile.am	Mon Oct 28 02:17:34 2002
@@ -62,5 +62,5 @@
 # don't do this if we are building in eg. rpm
 if SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA)
 endif
diff -Nru tmp/quick-lounge-applet-0.96/src/Makefile.in work/quick-lounge-applet-0.96/src/Makefile.in
--- tmp/quick-lounge-applet-0.96/src/Makefile.in	Tue Oct 15 11:47:13 2002
+++ work/quick-lounge-applet-0.96/src/Makefile.in	Mon Oct 28 02:17:50 2002
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -163,6 +163,9 @@
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/dlg-pick-applications.P .deps/dlg-properties.P \
+.deps/file-utils.P .deps/gtk-utils.P .deps/quick-box.P \
+.deps/quick-button.P .deps/quick-lounge.P .deps/quick-separator.P
 SOURCES = $(quick_lounge_applet_SOURCES)
 OBJECTS = $(quick_lounge_applet_OBJECTS)
 
@@ -170,9 +173,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -202,9 +205,6 @@
 	  rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -335,6 +335,11 @@
 subdir = src
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -345,25 +350,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-dlg-pick-applications.o: dlg-pick-applications.c ../config.h \
-	dlg-pick-applications.h quick-lounge.h file-utils.h typedefs.h \
-	quick-box.h quick-button.h quick-separator.h dlg-properties.h \
-	gtk-utils.h
-dlg-properties.o: dlg-properties.c ../config.h file-utils.h typedefs.h \
-	gtk-utils.h quick-lounge.h quick-box.h quick-button.h \
-	quick-separator.h dlg-properties.h dlg-pick-applications.h
-file-utils.o: file-utils.c file-utils.h typedefs.h
-gtk-utils.o: gtk-utils.c
-quick-box.o: quick-box.c ../config.h dlg-properties.h quick-lounge.h \
-	file-utils.h typedefs.h quick-box.h quick-button.h \
-	quick-separator.h gtk-utils.h
-quick-button.o: quick-button.c ../config.h quick-button.h
-quick-lounge.o: quick-lounge.c ../config.h dlg-pick-applications.h \
-	quick-lounge.h file-utils.h typedefs.h quick-box.h \
-	quick-button.h quick-separator.h dlg-properties.h gtk-utils.h
-quick-separator.o: quick-separator.c ../config.h quick-separator.h \
-	quick-button.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -406,23 +424,25 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-libexecPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-libexecPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-libexecPROGRAMS clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-libexecPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-libexecPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -435,10 +455,11 @@
 uninstall-gladeDATA install-gladeDATA uninstall-schemasDATA \
 install-schemasDATA uninstall-serverDATA install-serverDATA \
 uninstall-uiDATA install-uiDATA tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
@@ -450,7 +471,7 @@
 
 # don't do this if we are building in eg. rpm
 @SCHEMAS_INSTALL_TRUE install-data-local:
- SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA)
 
 # 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.
diff -Nru tmp/quick-lounge-applet-0.96/src/dlg-pick-applications.c work/quick-lounge-applet-0.96/src/dlg-pick-applications.c
--- tmp/quick-lounge-applet-0.96/src/dlg-pick-applications.c	Fri Sep 27 09:59:39 2002
+++ work/quick-lounge-applet-0.96/src/dlg-pick-applications.c	Mon Oct 28 02:17:34 2002
@@ -229,7 +229,7 @@
 
 			/**/
 
-			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 			if (icon_path != NULL)
 				icon = create_pixbuf (icon_path, ICON_SIZE_MENU);
 
@@ -289,7 +289,7 @@
 
 			/**/
 
-			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 			if (icon_path != NULL)
 				icon = create_pixbuf (icon_path, ICON_SIZE_MENU);
 
diff -Nru tmp/quick-lounge-applet-0.96/src/quick-box.c work/quick-lounge-applet-0.96/src/quick-box.c
--- tmp/quick-lounge-applet-0.96/src/quick-box.c	Tue Oct 15 10:57:27 2002
+++ work/quick-lounge-applet-0.96/src/quick-box.c	Mon Oct 28 02:17:34 2002
@@ -367,7 +367,7 @@
 		text = gnome_desktop_item_get_localestring (ditem, "Name"); 
 		item = gtk_image_menu_item_new_with_label (text);
 
-		icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+		icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 		if (icon_path != NULL)
 			icon = create_image (icon_path, ICON_SIZE_MENU);
 		if (icon != NULL)
@@ -504,8 +504,8 @@
 	priv->arrow_left  = create_arrow_button (quick_box, GTK_ARROW_LEFT);
 	priv->arrow_right = create_arrow_button (quick_box, GTK_ARROW_RIGHT);
 
-	quick_box->icon_loader = gnome_icon_loader_new ();
-	gnome_icon_loader_append_search_path (quick_box->icon_loader, PIXMAPSDIR);
+	quick_box->icon_theme = gnome_icon_theme_new ();
+	gnome_icon_theme_append_search_path (quick_box->icon_theme, PIXMAPSDIR);
 
 	quick_box->tooltips = gtk_tooltips_new ();
 	g_object_ref (quick_box->tooltips);
@@ -523,7 +523,7 @@
   
 	quick_box = QUICK_BOX (object);
 
-	g_object_unref (quick_box->icon_loader);
+	g_object_unref (quick_box->icon_theme);
 	if (quick_box->tooltips != NULL) 
                 g_object_unref (quick_box->tooltips);
 
@@ -1578,7 +1578,7 @@
 		return NULL;
 
 	text       = gnome_desktop_item_get_localestring (ditem, "Name"); 
-	icon_path  = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+	icon_path  = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 	child_size = get_child_size (quick_box);
 	button     = quick_button_new (icon_path, child_size, text);
 	g_free (icon_path);
@@ -1881,7 +1881,7 @@
 				ditem,
 				(GDestroyNotify) gnome_desktop_item_unref);
 
-	icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+	icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 	quick_button_set_pixmap (quick_button, 
 				 icon_path, 
 				 get_child_size (quick_box));
diff -Nru tmp/quick-lounge-applet-0.96/src/quick-box.h work/quick-lounge-applet-0.96/src/quick-box.h
--- tmp/quick-lounge-applet-0.96/src/quick-box.h	Sun Sep 22 15:09:20 2002
+++ work/quick-lounge-applet-0.96/src/quick-box.h	Mon Oct 28 02:17:34 2002
@@ -44,7 +44,7 @@
 struct _QuickBox {
 	GtkBox __parent;
 
-	GnomeIconLoader *icon_loader;
+	GnomeIconTheme  *icon_theme;
 	GtkTooltips     *tooltips;
 
 	QuickBoxPrivate *priv;
diff -Nru tmp/quick-lounge-applet-0.96/src/quick-button.c work/quick-lounge-applet-0.96/src/quick-button.c
--- tmp/quick-lounge-applet-0.96/src/quick-button.c	Tue Oct 15 10:54:25 2002
+++ work/quick-lounge-applet-0.96/src/quick-button.c	Mon Oct 28 02:17:34 2002
@@ -35,7 +35,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-icon-loader.h>
+#include <libgnomeui/gnome-icon-theme.h>
+#include <libgnomeui/gnome-icon-lookup.h>
 #include "quick-button.h"
 
 #define DEFAULT_OFFSET      2
@@ -257,18 +258,24 @@
  
 
 static GdkPixbuf *
-get_missing (GnomeIconLoader *loader, 
-	     int              preffered_size)
+get_missing (GnomeIconTheme *theme, 
+	     int            preffered_size)
 {
-	static char *default_pixmap = NULL;
-
-	if (default_pixmap == NULL) 
-		default_pixmap = gnome_icon_loader_lookup_icon (loader, "gnome-unknown.png", preffered_size, NULL);
+	char *filename = NULL; 
+	const GnomeIconData *icon_data = NULL;
+	int base_size;
+	GdkPixbuf *pixbuf; 
+
+	filename = gnome_icon_theme_lookup_icon (theme,
+						 "gnome-unknown.png",
+						 preffered_size,
+						 &icon_data, 
+						 &base_size);
 	
-	if (default_pixmap == NULL)
+	if (filename == NULL)
 		return missing_pixbuf (preffered_size);
 
-	return gdk_pixbuf_new_from_file (default_pixmap, NULL);
+	return gdk_pixbuf_new_from_file (filename, NULL); 
 }
 
 
@@ -340,31 +347,31 @@
 		    int          preffered_size)
 
 {
-	GnomeIconLoader *loader;
+	GnomeIconTheme  *theme;
 	GdkPixbuf       *new_pixbuf = NULL;
 	GError          *gerror = NULL;
 	int              w, h;
 	int              pixbuf_w, pixbuf_h;
 	double           scale;
 
-	loader = gnome_icon_loader_new ();
-	gnome_icon_loader_append_search_path (GNOME_ICON_LOADER (loader), 
-					      PIXMAPSDIR);
+	theme = gnome_icon_theme_new ();
+	gnome_icon_theme_append_search_path (GNOME_ICON_THEME (theme), 
+					     PIXMAPSDIR);
 
 	if (preffered_size <= 0)
 		preffered_size = DEFAULT_SIZE;
 	
 	if (path == NULL) 
-		new_pixbuf = get_missing (loader, preffered_size);
+		new_pixbuf = get_missing (theme, preffered_size);
 	else
 		new_pixbuf = gdk_pixbuf_new_from_file (path, &gerror);
 
 	if (new_pixbuf == NULL) {
 		g_clear_error (&gerror);
-		new_pixbuf = get_missing (loader, preffered_size);
+		new_pixbuf = get_missing (theme, preffered_size);
 	}
 
-	g_object_unref (loader);
+	g_object_unref (theme);
 
 	/**/
 
diff -Nru tmp/quick-lounge-applet-0.96/src/quick-separator.c work/quick-lounge-applet-0.96/src/quick-separator.c
--- tmp/quick-lounge-applet-0.96/src/quick-separator.c	Fri Aug 23 19:19:51 2002
+++ work/quick-lounge-applet-0.96/src/quick-separator.c	Mon Oct 28 02:17:34 2002
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-icon-loader.h>
+#include <libgnomeui/gnome-icon-theme.h>
 #include "quick-separator.h"
 
 static void     quick_separator_class_init      (QuickSeparatorClass  *klass);

diff -Nru tmp/gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c work/gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c
--- tmp/gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c	Fri Sep 13 21:59:12 2002
+++ work/gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c	Sun Oct 27 10:27:53 2002
@@ -407,15 +407,15 @@
 {
     MCData *mcdata;
 
+    mcdata = g_new0 (MCData, 1);
+    mcdata->applet = applet;
+  
     mcdata->history_position = LENGTH_HISTORY_LIST;
             
     gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-mini-commander.png");
     
     panel_applet_add_preferences (applet, "/schemas/apps/mini-commander/prefs", NULL);
     
-    mcdata = g_new0 (MCData, 1);
-    mcdata->applet = applet;
-  
     g_signal_connect(GTK_OBJECT(applet),
 		     "change_orient",
 		     G_CALLBACK(applet_orient_changed_cb),

diff -Nru quick-lounge-applet-0.96-orig/ChangeLog quick-lounge-applet-0.96/ChangeLog
--- quick-lounge-applet-0.96-orig/ChangeLog	Fri Sep 27 17:02:29 2002
+++ quick-lounge-applet-0.96/ChangeLog	Mon Oct 28 02:56:09 2002
@@ -1,3 +1,23 @@
+2002-10-28  Remi Cohen-Scali  <remi cohen-scali com>
+
+	* src/quick-box.h: Changed icon_loader field in icon_theme
+	for QuickBox widget struct.
+
+	* src/quick-button.c: changed inclusion of header libgnome/gnome-icon-loader.h
+	with inclusion of libgnomeui/gnome-icon-theme.h & libgnomeui/gnome-icon-lookup.h
+	(get_missing): Replaces GnomeIconLoader instance passed as parameter
+	with a GnomeIconTheme one. Also changed implem of get_missing according
+	to the way to use GnomeIconLoader.
+	Replaced also all others occurances.
+
+	* src/dlg-pick-applications.c:
+	* src/quick-box.c:
+	* src/quick-separator.c:
+	Changed headers and icon_loader with icon_theme.
+
+	* src/Makefile.am: removed a type for rule installing GConf schema.
+	Was schema_DATA instead of schemas_DATA
+
 2002-09-27  Paolo Bacchilega  <paolo bacch tin it>
 
 	[ Quick Lounge 0.93 ]
diff -Nru quick-lounge-applet-0.96-orig/src/Makefile.am quick-lounge-applet-0.96/src/Makefile.am
--- quick-lounge-applet-0.96-orig/src/Makefile.am	Tue Oct 15 11:42:51 2002
+++ quick-lounge-applet-0.96/src/Makefile.am	Mon Oct 28 02:39:02 2002
@@ -62,5 +62,5 @@
 # don't do this if we are building in eg. rpm
 if SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA)
 endif
diff -Nru quick-lounge-applet-0.96-orig/src/Makefile.in quick-lounge-applet-0.96/src/Makefile.in
--- quick-lounge-applet-0.96-orig/src/Makefile.in	Tue Oct 15 11:47:13 2002
+++ quick-lounge-applet-0.96/src/Makefile.in	Mon Oct 28 02:39:02 2002
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -163,6 +163,9 @@
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/dlg-pick-applications.P .deps/dlg-properties.P \
+.deps/file-utils.P .deps/gtk-utils.P .deps/quick-box.P \
+.deps/quick-button.P .deps/quick-lounge.P .deps/quick-separator.P
 SOURCES = $(quick_lounge_applet_SOURCES)
 OBJECTS = $(quick_lounge_applet_OBJECTS)
 
@@ -170,9 +173,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -202,9 +205,6 @@
 	  rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -335,6 +335,11 @@
 subdir = src
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -345,25 +350,38 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-dlg-pick-applications.o: dlg-pick-applications.c ../config.h \
-	dlg-pick-applications.h quick-lounge.h file-utils.h typedefs.h \
-	quick-box.h quick-button.h quick-separator.h dlg-properties.h \
-	gtk-utils.h
-dlg-properties.o: dlg-properties.c ../config.h file-utils.h typedefs.h \
-	gtk-utils.h quick-lounge.h quick-box.h quick-button.h \
-	quick-separator.h dlg-properties.h dlg-pick-applications.h
-file-utils.o: file-utils.c file-utils.h typedefs.h
-gtk-utils.o: gtk-utils.c
-quick-box.o: quick-box.c ../config.h dlg-properties.h quick-lounge.h \
-	file-utils.h typedefs.h quick-box.h quick-button.h \
-	quick-separator.h gtk-utils.h
-quick-button.o: quick-button.c ../config.h quick-button.h
-quick-lounge.o: quick-lounge.c ../config.h dlg-pick-applications.h \
-	quick-lounge.h file-utils.h typedefs.h quick-box.h \
-	quick-button.h quick-separator.h dlg-properties.h gtk-utils.h
-quick-separator.o: quick-separator.c ../config.h quick-separator.h \
-	quick-button.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -406,23 +424,25 @@
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-libexecPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-libexecPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-libexecPROGRAMS clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-libexecPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-libexecPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -435,10 +455,11 @@
 uninstall-gladeDATA install-gladeDATA uninstall-schemasDATA \
 install-schemasDATA uninstall-serverDATA install-serverDATA \
 uninstall-uiDATA install-uiDATA tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
@@ -450,7 +471,7 @@
 
 # don't do this if we are building in eg. rpm
 @SCHEMAS_INSTALL_TRUE install-data-local:
- SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA)
 
 # 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.
diff -Nru quick-lounge-applet-0.96-orig/src/dlg-pick-applications.c quick-lounge-applet-0.96/src/dlg-pick-applications.c
--- quick-lounge-applet-0.96-orig/src/dlg-pick-applications.c	Fri Sep 27 09:59:39 2002
+++ quick-lounge-applet-0.96/src/dlg-pick-applications.c	Mon Oct 28 02:39:02 2002
@@ -229,7 +229,7 @@
 
 			/**/
 
-			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 			if (icon_path != NULL)
 				icon = create_pixbuf (icon_path, ICON_SIZE_MENU);
 
@@ -289,7 +289,7 @@
 
 			/**/
 
-			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+			icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 			if (icon_path != NULL)
 				icon = create_pixbuf (icon_path, ICON_SIZE_MENU);
 
diff -Nru quick-lounge-applet-0.96-orig/src/quick-box.c quick-lounge-applet-0.96/src/quick-box.c
--- quick-lounge-applet-0.96-orig/src/quick-box.c	Tue Oct 15 10:57:27 2002
+++ quick-lounge-applet-0.96/src/quick-box.c	Mon Oct 28 02:39:02 2002
@@ -367,7 +367,7 @@
 		text = gnome_desktop_item_get_localestring (ditem, "Name"); 
 		item = gtk_image_menu_item_new_with_label (text);
 
-		icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+		icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 		if (icon_path != NULL)
 			icon = create_image (icon_path, ICON_SIZE_MENU);
 		if (icon != NULL)
@@ -504,8 +504,8 @@
 	priv->arrow_left  = create_arrow_button (quick_box, GTK_ARROW_LEFT);
 	priv->arrow_right = create_arrow_button (quick_box, GTK_ARROW_RIGHT);
 
-	quick_box->icon_loader = gnome_icon_loader_new ();
-	gnome_icon_loader_append_search_path (quick_box->icon_loader, PIXMAPSDIR);
+	quick_box->icon_theme = gnome_icon_theme_new ();
+	gnome_icon_theme_append_search_path (quick_box->icon_theme, PIXMAPSDIR);
 
 	quick_box->tooltips = gtk_tooltips_new ();
 	g_object_ref (quick_box->tooltips);
@@ -523,7 +523,7 @@
   
 	quick_box = QUICK_BOX (object);
 
-	g_object_unref (quick_box->icon_loader);
+	g_object_unref (quick_box->icon_theme);
 	if (quick_box->tooltips != NULL) 
                 g_object_unref (quick_box->tooltips);
 
@@ -1578,7 +1578,7 @@
 		return NULL;
 
 	text       = gnome_desktop_item_get_localestring (ditem, "Name"); 
-	icon_path  = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+	icon_path  = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 	child_size = get_child_size (quick_box);
 	button     = quick_button_new (icon_path, child_size, text);
 	g_free (icon_path);
@@ -1881,7 +1881,7 @@
 				ditem,
 				(GDestroyNotify) gnome_desktop_item_unref);
 
-	icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_loader);
+	icon_path = gnome_desktop_item_get_icon (ditem, quick_box->icon_theme);
 	quick_button_set_pixmap (quick_button, 
 				 icon_path, 
 				 get_child_size (quick_box));
diff -Nru quick-lounge-applet-0.96-orig/src/quick-box.h quick-lounge-applet-0.96/src/quick-box.h
--- quick-lounge-applet-0.96-orig/src/quick-box.h	Sun Sep 22 15:09:20 2002
+++ quick-lounge-applet-0.96/src/quick-box.h	Mon Oct 28 02:39:02 2002
@@ -44,7 +44,7 @@
 struct _QuickBox {
 	GtkBox __parent;
 
-	GnomeIconLoader *icon_loader;
+	GnomeIconTheme  *icon_theme;
 	GtkTooltips     *tooltips;
 
 	QuickBoxPrivate *priv;
diff -Nru quick-lounge-applet-0.96-orig/src/quick-button.c quick-lounge-applet-0.96/src/quick-button.c
--- quick-lounge-applet-0.96-orig/src/quick-button.c	Tue Oct 15 10:54:25 2002
+++ quick-lounge-applet-0.96/src/quick-button.c	Mon Oct 28 02:39:02 2002
@@ -35,7 +35,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-icon-loader.h>
+#include <libgnomeui/gnome-icon-theme.h>
+#include <libgnomeui/gnome-icon-lookup.h>
 #include "quick-button.h"
 
 #define DEFAULT_OFFSET      2
@@ -257,18 +258,24 @@
  
 
 static GdkPixbuf *
-get_missing (GnomeIconLoader *loader, 
-	     int              preffered_size)
+get_missing (GnomeIconTheme *theme, 
+	     int            preffered_size)
 {
-	static char *default_pixmap = NULL;
-
-	if (default_pixmap == NULL) 
-		default_pixmap = gnome_icon_loader_lookup_icon (loader, "gnome-unknown.png", preffered_size, NULL);
+	char *filename = NULL; 
+	const GnomeIconData *icon_data = NULL;
+	int base_size;
+	GdkPixbuf *pixbuf; 
+
+	filename = gnome_icon_theme_lookup_icon (theme,
+						 "gnome-unknown.png",
+						 preffered_size,
+						 &icon_data, 
+						 &base_size);
 	
-	if (default_pixmap == NULL)
+	if (filename == NULL)
 		return missing_pixbuf (preffered_size);
 
-	return gdk_pixbuf_new_from_file (default_pixmap, NULL);
+	return gdk_pixbuf_new_from_file (filename, NULL); 
 }
 
 
@@ -340,31 +347,31 @@
 		    int          preffered_size)
 
 {
-	GnomeIconLoader *loader;
+	GnomeIconTheme  *theme;
 	GdkPixbuf       *new_pixbuf = NULL;
 	GError          *gerror = NULL;
 	int              w, h;
 	int              pixbuf_w, pixbuf_h;
 	double           scale;
 
-	loader = gnome_icon_loader_new ();
-	gnome_icon_loader_append_search_path (GNOME_ICON_LOADER (loader), 
-					      PIXMAPSDIR);
+	theme = gnome_icon_theme_new ();
+	gnome_icon_theme_append_search_path (GNOME_ICON_THEME (theme), 
+					     PIXMAPSDIR);
 
 	if (preffered_size <= 0)
 		preffered_size = DEFAULT_SIZE;
 	
 	if (path == NULL) 
-		new_pixbuf = get_missing (loader, preffered_size);
+		new_pixbuf = get_missing (theme, preffered_size);
 	else
 		new_pixbuf = gdk_pixbuf_new_from_file (path, &gerror);
 
 	if (new_pixbuf == NULL) {
 		g_clear_error (&gerror);
-		new_pixbuf = get_missing (loader, preffered_size);
+		new_pixbuf = get_missing (theme, preffered_size);
 	}
 
-	g_object_unref (loader);
+	g_object_unref (theme);
 
 	/**/
 
diff -Nru quick-lounge-applet-0.96-orig/src/quick-separator.c quick-lounge-applet-0.96/src/quick-separator.c
--- quick-lounge-applet-0.96-orig/src/quick-separator.c	Fri Aug 23 19:19:51 2002
+++ quick-lounge-applet-0.96/src/quick-separator.c	Mon Oct 28 02:39:02 2002
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome/gnome-icon-loader.h>
+#include <libgnomeui/gnome-icon-theme.h>
 #include "quick-separator.h"
 
 static void     quick_separator_class_init      (QuickSeparatorClass  *klass);

diff -Nru gnome-applets-2.0.3-orig/ChangeLog gnome-applets-2.0.3/ChangeLog
--- gnome-applets-2.0.3-orig/ChangeLog	Fri Sep 13 21:58:51 2002
+++ gnome-applets-2.0.3/ChangeLog	Mon Oct 28 02:34:21 2002
@@ -1,3 +1,8 @@
+2002-10-28  Remi Cohen-Scali  <remi cohen-scali com>
+
+	* mini-commander/src/mini-commander_applet.c (mini_commander_applet_fill): 
+	Moved MCData allocation before its use to avoid crash.
+
 2002-09-13  Kevin Vandersloot <kfv101 psu edu>
 
 	* configure.in: release 2.0.3
diff -Nru gnome-applets-2.0.3-orig/mini-commander/src/mini-commander_applet.c gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c
--- gnome-applets-2.0.3-orig/mini-commander/src/mini-commander_applet.c	Fri Sep 13 21:59:12 2002
+++ gnome-applets-2.0.3/mini-commander/src/mini-commander_applet.c	Mon Oct 28 02:33:30 2002
@@ -407,15 +407,15 @@
 {
     MCData *mcdata;
 
+    mcdata = g_new0 (MCData, 1);
+    mcdata->applet = applet;
+  
     mcdata->history_position = LENGTH_HISTORY_LIST;
             
     gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-mini-commander.png");
     
     panel_applet_add_preferences (applet, "/schemas/apps/mini-commander/prefs", NULL);
     
-    mcdata = g_new0 (MCData, 1);
-    mcdata->applet = applet;
-  
     g_signal_connect(GTK_OBJECT(applet),
 		     "change_orient",
 		     G_CALLBACK(applet_orient_changed_cb),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]