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

Add homepage handling in _action_navigation_activate ()

Browse source
This commit is contained in:
Alexander Butenko 2010-06-25 11:18:22 -04:00 committed by Christian Dywan
parent 6d7e1838ea
commit 0bc4933c17
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
midori/midori-browser.c
View file

@ -3517,23 +3517,12 @@ _action_navigation_activate (GtkAction* action,
midori_view_set_uri (view, uri); midori_view_set_uri (view, uri);
g_free (uri); g_free (uri);
} }
} else if (g_str_equal (name, "Homepage"))
static void
_action_homepage_activate (GtkAction* action,
MidoriBrowser* browser)
{ {
gchar* homepage; g_object_get (browser->settings, "homepage", &uri, NULL);
midori_view_set_uri (view, uri);
if (g_object_get_data (G_OBJECT (action), "midori-middle-click")) g_free (uri);
{
g_object_set_data (G_OBJECT (action), "midori-middle-click", (void*)0);
return;
} }
g_object_get (browser->settings, "homepage", &homepage, NULL);
midori_browser_set_current_uri (browser, homepage);
g_free (homepage);
} }
static void static void
@ -5197,7 +5186,7 @@ static const GtkActionEntry entries[] =
N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) }, N_("Go to the next sub-page"), G_CALLBACK (_action_navigation_activate) },
{ "Homepage", STOCK_HOMEPAGE, { "Homepage", STOCK_HOMEPAGE,
NULL, "<Alt>Home", NULL, "<Alt>Home",
N_("Go to your homepage"), G_CALLBACK (_action_homepage_activate) }, N_("Go to your homepage"), G_CALLBACK (_action_navigation_activate) },
{ "TrashEmpty", GTK_STOCK_CLEAR, { "TrashEmpty", GTK_STOCK_CLEAR,
N_("Empty Trash"), "", N_("Empty Trash"), "",
N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) }, N_("Delete the contents of the trash"), G_CALLBACK (_action_trash_empty_activate) },