Change from the Blue Gnu Card icon to the Tango-theme icon.

Change from a single default icon to the default-set of 16x16, 32x32 and 48x48.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15906 57a11ea4-9604-0410-9ed3-97b8803252fd

src/gnome-utils/gnc-gnome-utils.c

@@ -196,7 +196,6 @@ gnc_gtk_add_rc_file (void)
 void
 gnc_gnome_init (int argc, char **argv, const char * version)
 {
-  char *fullname;
   GError *error = NULL;
   gchar *prefix = gnc_path_get_prefix ();
   gchar *pkgsysconfdir = gnc_path_get_pkgsysconfdir ();
@@ -226,14 +225,38 @@ gnc_gnome_init (int argc, char **argv, const char * version)
   gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
 
   /* use custom icon */
-  fullname = gnc_gnome_locate_pixmap ("gnucash-icon.png");
+  {
-  if (fullname) {
+    int idx;
-    gtk_window_set_default_icon_from_file (fullname, &error);
+    char *icon_filenames[] = {"gnucash-icon-16x16.png",
-    g_free(fullname);
+                              "gnucash-icon-32x32.png",
-    if (error) {
+                              "gnucash-icon-48x48.png",
-      PERR ("Could not set default icon: %s", error->message);
+                              NULL};
-      g_error_free (error);
+    GList *icons = NULL;
+    char *fullname, *name_iter;
+
+    for (idx = 0; icon_filenames[idx] != NULL; idx++) {
+      GdkPixbuf *buf = NULL;
+
+      fullname = gnc_gnome_locate_pixmap(icon_filenames[idx]);
+      if (fullname == NULL) {
+        g_warning("couldn't find icon file [%s]", icon_filenames[idx]);
+        continue;
       }
+        
+      buf = gnc_gnome_get_gdkpixbuf(fullname);
+      if (buf == NULL)
+      {
+        g_warning("error loading image from [%s]", fullname);
+        g_free(fullname);
+        continue;
+      }
+      g_free(fullname);
+      icons = g_list_append(icons, buf);
+    }
+
+    gtk_window_set_default_icon_list(icons);
+    g_list_foreach(icons, (GFunc)g_object_unref, NULL);
+    g_list_free(icons);
   }
 
   druid_gconf_install_check_schemas();

src/gnome-utils/gnc-main-window.c

@@ -3458,7 +3458,7 @@ gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
 	gchar **authors, **documenters, *license, *message;
 	GdkPixbuf *logo;
 
-	logo = gnc_gnome_get_gdkpixbuf ("appicon.png");
+	logo = gnc_gnome_get_gdkpixbuf ("gnucash-icon-48x48.png");
 
 	authors = get_file_strsplit("doc/AUTHORS");
 	documenters = get_file_strsplit("doc/DOCUMENTERS");

src/pixmaps/Makefile.am

@@ -1,7 +1,6 @@
 gncpixmapdir = ${GNC_PIXMAP_DIR}
 
 gncpixmap_DATA = \
-  appicon.png \
   gnc-account-16.png \
   gnc-account-delete-16.png \
   gnc-account-delete.png \
@@ -29,13 +28,17 @@ gncpixmap_DATA = \
   gnc-transfer-16.png \
   gnc-transfer.png \
   gnucash-icon.ico \
-  gnucash-icon.png \
+  gnucash-icon-16x16.png \
+  gnucash-icon-32x32.png \
+  gnucash-icon-48x48.png \
   gnucash_splash.png \
   stock_split_title.png \
   stock_split_watermark.png
 
 gncicondir = ${datadir}/pixmaps
-gncicon_DATA = gnucash-icon.png
+gncicon_DATA = gnucash-icon-16x16.png \
+  gnucash-icon-32x32.png \
+  gnucash-icon-48x48.png
 
 EXTRA_DIST = \
   ${gncpixmap_DATA} ${gncicon_DATA}