SF.net SVN: geany-plugins:[1657] trunk/geany-plugins/treebrowser
dimitrov-adrian at users.sourceforge.net
dimitrov-adrian at xxxxx
Sat Oct 16 15:43:29 UTC 2010
Revision: 1657
http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1657&view=rev
Author: dimitrov-adrian
Date: 2010-10-16 15:43:29 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Treebrowser: Fixed unref data in utils_pixbuf_from_path(), Changed default icon for bookmarks to GTK_STOCK_HOME
Modified Paths:
--------------
trunk/geany-plugins/treebrowser/ChangeLog
trunk/geany-plugins/treebrowser/src/treebrowser.c
Modified: trunk/geany-plugins/treebrowser/ChangeLog
===================================================================
--- trunk/geany-plugins/treebrowser/ChangeLog 2010-10-16 15:08:43 UTC (rev 1656)
+++ trunk/geany-plugins/treebrowser/ChangeLog 2010-10-16 15:43:29 UTC (rev 1657)
@@ -41,6 +41,9 @@
16-10-2010 Adrian Dimitrov <dimitrov.adrian at gmail.com>
* src/treebrowser.c
+ Fixed unref data in utils_pixbuf_from_path()
+ Changed default icon for bookmarks to GTK_STOCK_HOME
+
Added new option to show mime-type icons (can be configured by the preferences)
(Idea from Colomban Wendling`s mail)
Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c
===================================================================
--- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-16 15:08:43 UTC (rev 1656)
+++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-10-16 15:43:29 UTC (rev 1657)
@@ -154,29 +154,34 @@
utils_pixbuf_from_path(gchar *path)
{
GIcon *icon;
- GdkPixbuf *ret = NULL;
+ GdkPixbuf *ret = NULL;
GtkIconInfo *info;
- gint width;
+ gchar *ctype;
+ gint width;
- icon = g_content_type_get_icon(g_content_type_guess(path, NULL, 0, NULL));
+ ctype = g_content_type_guess(path, NULL, 0, NULL);
+ icon = g_content_type_get_icon(ctype);
+ g_free(ctype);
if (icon != NULL)
{
- gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, NULL);
- info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default(), icon, width, GTK_ICON_LOOKUP_USE_BUILTIN);
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, NULL);
+ info = gtk_icon_theme_lookup_by_gicon(gtk_icon_theme_get_default(), icon, width, GTK_ICON_LOOKUP_USE_BUILTIN);
if (!info)
return NULL;
ret = gtk_icon_info_load_icon (info, NULL);
- gtk_icon_info_free (info);
+ gtk_icon_info_free(info);
}
+ g_object_unref(icon);
+
return ret;
}
static GdkPixbuf *
utils_pixbuf_from_stock(const gchar *stock_id)
{
- GtkIconSet *icon_set;
+ GtkIconSet *icon_set;
icon_set = gtk_icon_factory_lookup_default(stock_id);
@@ -184,7 +189,6 @@
return gtk_icon_set_render_icon(icon_set, gtk_widget_get_default_style(),
gtk_widget_get_default_direction(),
GTK_STATE_NORMAL, GTK_ICON_SIZE_MENU, NULL, NULL);
-
return NULL;
}
@@ -485,7 +489,7 @@
{
gtk_tree_store_prepend(treestore, &bookmarks_iter, NULL);
gtk_tree_store_set(treestore, &bookmarks_iter,
- TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_DIRECTORY) : NULL,
+ TREEBROWSER_COLUMN_ICON, CONFIG_SHOW_ICONS ? utils_pixbuf_from_stock(GTK_STOCK_HOME) : NULL,
TREEBROWSER_COLUMN_NAME, _("Bookmarks"),
TREEBROWSER_COLUMN_URI, NULL,
-1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Plugins-Commits
mailing list