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

Use go-jump-symbolic for 'Go to' if available

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/772106
This commit is contained in:
Christian Dywan 2012-04-21 22:53:47 +02:00
parent e29af0b634
commit 1ce2a57f4b
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-browser.c
View file

@ -3690,8 +3690,14 @@ static void
_action_location_focus_in (GtkAction* action, _action_location_focus_in (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
midori_location_action_set_secondary_icon ( GdkScreen* screen = gtk_widget_get_screen (browser->notebook);
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); GtkIconTheme* icon_theme = gtk_icon_theme_get_for_screen (screen);
if (gtk_icon_theme_has_icon (icon_theme, "go-jump-symbolic"))
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), "go-jump-symbolic");
else
midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
} }
static void static void

18
midori/midori-locationaction.c
View file

@ -1649,6 +1649,15 @@ midori_location_action_set_progress (MidoriLocationAction* location_action,
} }
} }
/**
* midori_location_action_set_security_hint:
* @location_action: a #MidoriLocationAction
* @icon: a stock ID, or an icon name
*
* Sets the secondary, ie right hand side icon.
*
* Since 0.4.6 @icon can be a stock ID or an icon name.
**/
void void
midori_location_action_set_secondary_icon (MidoriLocationAction* location_action, midori_location_action_set_secondary_icon (MidoriLocationAction* location_action,
const gchar* stock_id) const gchar* stock_id)
@ -1659,7 +1668,6 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action
GtkStockItem stock_item; GtkStockItem stock_item;
g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action)); g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
g_return_if_fail (!stock_id || gtk_stock_lookup (stock_id, &stock_item));
katze_assign (location_action->secondary_icon, g_strdup (stock_id)); katze_assign (location_action->secondary_icon, g_strdup (stock_id));
@ -1670,8 +1678,12 @@ midori_location_action_set_secondary_icon (MidoriLocationAction* location_action
if (GTK_IS_TOOL_ITEM (proxies->data)) if (GTK_IS_TOOL_ITEM (proxies->data))
{ {
GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data); GtkWidget* entry = midori_location_action_entry_for_proxy (proxies->data);
gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry), if (stock_id && gtk_stock_lookup (stock_id, &stock_item))
GTK_ICON_ENTRY_SECONDARY, stock_id); gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_SECONDARY, stock_id);
else
gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_SECONDARY, stock_id);
} }
#endif #endif
} }