HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make use of theme icon a various pref."

Browse Source 
A preference for an icon doesn't make sense;  if someone don't like
her theme's icon she should either switch to another theme, override
that specific icon or don't bother.

This reverts commit 6897cd49c69535c6563e56ae011c6f8382fec485.
This commit is contained in:
Colomban Wendling 2013-01-01 19:04:59 +01:00
parent b9c1c90938
commit 003435e16d
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keyfile.c
View File

@ -240,10 +240,6 @@ static void init_pref_groups(void)
"number_non_ft_menu_items", 0);
stash_group_add_integer(group, &build_menu_prefs.number_exec_menu_items,
"number_exec_menu_items", 0);
/* use the Geany icon instead of the theme */
stash_group_add_boolean(group, &main_use_geany_icon,
"use_geany_icon", TRUE);
}

20
src/main.c
View File

@ -90,7 +90,6 @@ gboolean ignore_callback; /* hack workaround for GTK+ toggle button callback pro
GeanyStatus main_status;
CommandLineOptions cl_options; /* fields initialised in parse_command_line_options */
gboolean main_use_geany_icon;
static const gchar geany_lib_versions[] = "GTK %u.%u.%u, GLib %u.%u.%u";
@ -1061,19 +1060,12 @@ gint main(gint argc, gchar **argv)
/* set window icon */
{
GdkPixbuf *pb;
if (main_use_geany_icon)
{
pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
}
else
{
pb = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "geany", 48, 0, NULL);
if (pb == NULL)
{
g_warning("Unable to find Geany icon in theme, using embedded icon");
pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
}
}
pb = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "geany", 48, 0, NULL);
if (pb == NULL)
{
g_warning("Unable to find Geany icon in theme, using embedded icon");
pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
}
gtk_window_set_icon(GTK_WINDOW(main_widgets.window), pb);
g_object_unref(pb); /* free our reference */
}

2
src/main.h
View File

@ -51,8 +51,6 @@ GeanyStatus;
extern GeanyStatus main_status;
extern gboolean main_use_geany_icon;
const gchar *main_get_version_string(void);