diff options
| author | Christian Dywan <christian@twotoasts.de> | 2009-11-17 23:22:08 +0100 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2009-11-17 23:22:08 +0100 |
| commit | 0448d0c06f1aaec35d913fd98397169e344af234 (patch) | |
| tree | 89707b23e3b6a65e4dae48a726ed96381d27bf58 /katze/katze-arrayaction.c | |
| parent | 8d8ddbbb300237a0fbf1eb71c81fc38d55963b11 (diff) | |
| download | midori-0448d0c06f1aaec35d913fd98397169e344af234.tar.gz | |
Refactor loading cached page icon into katze_load_cached_icon
The function is optimized for loading icons and independant from
a KatzeNet instance.
Diffstat (limited to 'katze/katze-arrayaction.c')
| -rw-r--r-- | katze/katze-arrayaction.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index db17b687..d36095e8 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -301,8 +301,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), NULL, proxy, NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); } @@ -460,8 +459,7 @@ katze_array_action_item_notify_cb (KatzeItem* item, } else if (!KATZE_IS_ARRAY (item) && !strcmp (property, "uri")) { - icon = katze_net_load_icon (array_action->net, katze_item_get_uri (item), - NULL, GTK_WIDGET (toolitem), NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), GTK_WIDGET (toolitem)); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); @@ -497,8 +495,7 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, icon = gtk_widget_render_icon (menuitem, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, - katze_item_get_uri (item), NULL, proxy, NULL); + icon = katze_load_cached_icon (katze_item_get_uri (item), proxy); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); } @@ -569,8 +566,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, icon = gtk_widget_render_icon (GTK_WIDGET (toolitem), GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL); else - icon = katze_net_load_icon (array_action->net, uri, - NULL, GTK_WIDGET (toolitem), NULL); + icon = katze_load_cached_icon (uri, GTK_WIDGET (toolitem)); image = gtk_image_new_from_pixbuf (icon); g_object_unref (icon); gtk_widget_show (image); |