debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Always add None and Custom to application property proxies

Browse source
This commit is contained in:
Christian Dywan 2010-10-13 23:13:02 +02:00
parent 324d3c3d6a
commit f3c519d715
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
katze/katze-utils.c
View file

@ -645,6 +645,8 @@ katze_property_proxy (gpointer object,
const gchar* app_type = &hint[12]; const gchar* app_type = &hint[12];
GtkSettings* settings; GtkSettings* settings;
gint icon_width = 16; gint icon_width = 16;
GtkTreeIter iter_none;
GAppInfo* info;
settings = gtk_settings_get_for_screen (gdk_screen_get_default ()); settings = gtk_settings_get_for_screen (gdk_screen_get_default ());
gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
@ -669,14 +671,12 @@ katze_property_proxy (gpointer object,
if (!g_strcmp0 (string, "")) if (!g_strcmp0 (string, ""))
katze_assign (string, NULL); 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);
GtkTreeIter iter_none;
gint i = 0;
GAppInfo* info;
gtk_list_store_insert_with_values (model, &iter_none, 0, if (apps != NULL)
0, NULL, 1, NULL, 2, _("None"), 3, icon_width, -1); {
gint i = 0;
while ((info = g_list_nth_data (apps, i++))) while ((info = g_list_nth_data (apps, i++)))
{ {
@ -696,7 +696,10 @@ katze_property_proxy (gpointer object,
g_free (icon_name); g_free (icon_name);
} }
g_list_free (apps);
}
{
info = g_app_info_create_from_commandline ("", info = g_app_info_create_from_commandline ("",
"", G_APP_INFO_CREATE_NONE, NULL); "", G_APP_INFO_CREATE_NONE, NULL);
gtk_list_store_insert_with_values (model, NULL, G_MAXINT, 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); gtk_combo_box_set_active_iter (combo, &iter_none);
} }
} }
g_list_free (apps);
g_signal_connect (widget, "changed", g_signal_connect (widget, "changed",
G_CALLBACK (proxy_combo_box_apps_changed_cb), object); G_CALLBACK (proxy_combo_box_apps_changed_cb), object);
} }