fix the macro

2002-09-26  jacob berkman  <jacob@ximian.com>

	* capplet-dir.c (find_icon): fix the macro

	* capplet-dir-view.c (capplet_dir_view_init): use control-center2.png

	* Makefile.am: remove control-center.png which conflicts with the
	gnome 1 package and define different macros for $datadir/pixmaps
	and $gnomecc_icon_dir

control-center/ChangeLog

@@ -1,3 +1,13 @@
+2002-09-26  jacob berkman  <jacob@ximian.com>
+
+	* capplet-dir.c (find_icon): fix the macro
+
+	* capplet-dir-view.c (capplet_dir_view_init): use control-center2.png
+
+	* Makefile.am: remove control-center.png which conflicts with the
+	gnome 1 package and define different macros for $datadir/pixmaps
+	and $gnomecc_icon_dir
+
 2002-08-21  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.0

control-center/Makefile.am

@@ -1,6 +1,3 @@
-appicondir = $(GNOMECC_ICONS_DIR)
-appicon_DATA = control-center.png
-
 splashdir = $(datadir)/pixmaps/gnomecc-2
 splash_DATA = \
 	bcg_top.png \
@@ -19,7 +16,8 @@ ui_DATA = gnomecc-ui.xml
 INCLUDES = 							\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
 	-DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\"		\
-	-DPIXMAPS_DIR=\""$(appicondir)"\"			\
+	-DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\"		\
+	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"			\
 	-DART_DIR=\""$(splashdir)"\"				\
 	-DGNOME_SBINDIR=\""$(sbindir)"\"			\
 	$(GNOMECC_CFLAGS)

control-center/capplet-dir-view.c

@@ -128,7 +128,7 @@ capplet_dir_view_init (CappletDirView *view, CappletDirViewClass *class)
 
 	gtk_window_set_default_size (GTK_WINDOW (view->app), 620, 430);
 	gnome_window_icon_set_from_file (GTK_WINDOW (view->app), 
-					 PIXMAPS_DIR "/control-center.png");
+					 PIXMAP_DIR "/control-center2.png");
 
 	ui_component = bonobo_ui_component_new ("gnomecc");
 	bonobo_ui_component_set_container (ui_component, bonobo_object_corba_objref (BONOBO_OBJECT (ui_container)), NULL);

control-center/capplet-dir.c

@@ -67,7 +67,7 @@ find_icon (const char *icon, GnomeDesktopItem *dentry)
 		if (icon_file[0] != '/')
 		{
 			gchar *old = icon_file;
-			icon_file = g_build_filename (PIXMAPS_DIR, old, NULL);
+			icon_file = g_build_filename (GNOMECC_ICONS_DIR, old, NULL);
 			g_free (old);
 		}
 		if (!g_file_test (icon_file, G_FILE_TEST_EXISTS) || g_file_test(icon_file, G_FILE_TEST_IS_DIR))