Permalink
Browse files

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

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 6897cd4.
  • Loading branch information...
1 parent b9c1c90 commit 003435e16ded66be6084a017a3169a1fc8a61bcb @b4n b4n committed Jan 1, 2013
Showing with 6 additions and 20 deletions.
  1. +0 −4 src/keyfile.c
  2. +6 −14 src/main.c
  3. +0 −2 src/main.h
View
@@ -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);
}
View
@@ -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 */
}
View
@@ -51,8 +51,6 @@ GeanyStatus;
extern GeanyStatus main_status;
-extern gboolean main_use_geany_icon;
-
const gchar *main_get_version_string(void);

0 comments on commit 003435e

Please sign in to comment.