diff options
author | Christian Dywan <christian@twotoasts.de> | 2010-10-13 23:13:02 +0200 |
---|---|---|
committer | Christian Dywan <christian@twotoasts.de> | 2010-10-13 23:13:02 +0200 |
commit | 391c9790185695ab897e910ab0d9ae94fbbbbaec (patch) | |
tree | f42f6b0d76892b53e6beaa6c9a5fb5601bc5927e /katze/katze-utils.c | |
parent | 20b5ad0edffedde163aeadacf5751dc53d4c69e3 (diff) | |
download | midori-391c9790185695ab897e910ab0d9ae94fbbbbaec.tar.gz |
Always add None and Custom to application property proxies
Diffstat (limited to 'katze/katze-utils.c')
-rw-r--r-- | katze/katze-utils.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/katze/katze-utils.c b/katze/katze-utils.c index feb970cd..fab3d9bb 100644 --- a/katze/katze-utils.c +++ b/katze/katze-utils.c @@ -645,6 +645,8 @@ katze_property_proxy (gpointer object, const gchar* app_type = &hint[12]; GtkSettings* settings; gint icon_width = 16; + GtkTreeIter iter_none; + GAppInfo* info; settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, @@ -669,14 +671,12 @@ katze_property_proxy (gpointer object, if (!g_strcmp0 (string, "")) katze_assign (string, NULL); - if (apps) + gtk_list_store_insert_with_values (model, &iter_none, 0, + 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); + + if (apps != NULL) { - GtkTreeIter iter_none; gint i = 0; - GAppInfo* info; - - gtk_list_store_insert_with_values (model, &iter_none, 0, - 0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); while ((info = g_list_nth_data (apps, i++))) { @@ -696,7 +696,10 @@ katze_property_proxy (gpointer object, g_free (icon_name); } + g_list_free (apps); + } + { info = g_app_info_create_from_commandline ("", "", G_APP_INFO_CREATE_NONE, NULL); gtk_list_store_insert_with_values (model, NULL, G_MAXINT, @@ -731,7 +734,6 @@ katze_property_proxy (gpointer object, gtk_combo_box_set_active_iter (combo, &iter_none); } } - g_list_free (apps); g_signal_connect (widget, "changed", G_CALLBACK (proxy_combo_box_apps_changed_cb), object); } |