Revision: 3887
http://geany.svn.sourceforge.net/geany/?rev=3887&view=rev
Author: eht16
Date: 2009-06-21 21:19:43 +0000 (Sun, 21 Jun 2009)
Log Message:
-----------
Rename shadowed variable name (sync with function definition).
Modified Paths:
--------------
trunk/tagmanager/include/tm_workspace.h
Modified: trunk/tagmanager/include/tm_workspace.h
===================================================================
--- trunk/tagmanager/include/tm_workspace.h 2009-06-21 21:19:30 UTC (rev 3886)
+++ trunk/tagmanager/include/tm_workspace.h 2009-06-21 21:19:43 UTC (rev 3887)
@@ -63,11 +63,11 @@
/*! Removes a member object from the workspace if it exists.
\param work_object Pointer to the work object to be removed.
- \param free Whether the work object is to be freed as well.
+ \param do_free Whether the work object is to be freed as well.
\param update Whether to update workspace objects.
\return TRUE on success, FALSE on failure (e.g. the work object does not exist).
*/
-gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean free, gboolean update);
+gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean do_free, gboolean update);
/* Loads the global tag list from the specified file. The global tag list should
have been first created using tm_workspace_create_global_tags().
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
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.