SF.net SVN: geany:[3884] trunk

[eht16 at users.sourceforge.net]

Revision: 3884
          http://geany.svn.sourceforge.net/geany/?rev=3884&view=rev
Author:   eht16
Date:     2009-06-20 17:32:55 +0000 (Sat, 20 Jun 2009)

Log Message:
-----------
Invert the logic to determine which Save All we want to use:
Use the Tango like icon only for the Tango theme and the Gnome / GTK like icon for any other themes.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/ui_utils.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-20 17:23:01 UTC (rev 3883)
+++ trunk/ChangeLog	2009-06-20 17:32:55 UTC (rev 3884)
@@ -27,6 +27,10 @@
    Init stock items before creating the toolbar (closes #2809324).
  * wscript:
    Generate the geany.pc file also on Windows.
+ * src/ui_utils.c:
+   Invert the logic to determine which Save All we want to use:
+   Use the Tango like icon only for the Tango theme and the Gnome / GTK
+   like icon for any other themes.
 
 
 2009-06-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c	2009-06-20 17:23:01 UTC (rev 3883)
+++ trunk/src/ui_utils.c	2009-06-20 17:32:55 UTC (rev 3884)
@@ -845,7 +845,7 @@
 }
 
 
-static gboolean have_gnome_icon_theme(void)
+static gboolean have_tango_icon_theme(void)
 {
 	static gboolean result = FALSE;
 	static gboolean checked = FALSE;
@@ -857,7 +857,7 @@
 		g_object_get(G_OBJECT(gtk_settings_get_default()), "gtk-icon-theme-name", &theme_name, NULL);
 		setptr(theme_name, g_utf8_strdown(theme_name, -1));
 
-		result = (strstr(theme_name, "gnome") != NULL);
+		result = (strstr(theme_name, "tango") != NULL);
 		checked = TRUE;
 
 		g_free(theme_name);
@@ -879,10 +879,10 @@
 		{
 			/* check whether the icon theme looks like a Gnome icon theme, if so use the
 			 * old Gnome based Save All icon, otherwise assume a Tango-like icon theme */
-			if (have_gnome_icon_theme())
+			if (have_tango_icon_theme())
+				return gdk_pixbuf_new_from_inline(-1, save_all_tango_inline, FALSE, NULL);
+			else
 				return gdk_pixbuf_new_from_inline(-1, save_all_gnome_inline, FALSE, NULL);
-			else
-				return gdk_pixbuf_new_from_inline(-1, save_all_tango_inline, FALSE, NULL);
 			break;
 		}
 		case GEANY_IMAGE_CLOSE_ALL:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.