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

Build fix: Accidentally removed the wrong action.

Browse source
This commit is contained in:
Christian Dywan 2008-03-10 22:48:12 +01:00
parent e1f62329f1
commit 9abae486dd
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/midori-browser.c
View file

@ -371,7 +371,7 @@ static gboolean
midori_web_view_console_message_cb (GtkWidget* web_view, midori_web_view_console_message_cb (GtkWidget* web_view,
const gchar* message, const gchar* message,
gint line, gint line,
const gchar* sourceId, const gchar* source_id,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
// FIXME: We want this to appear in a panel // FIXME: We want this to appear in a panel
@ -397,7 +397,7 @@ midori_web_view_populate_popup_cb (GtkWidget* web_view,
if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view))) if (!uri && !webkit_web_view_has_selection (WEBKIT_WEB_VIEW (web_view)))
{ {
// TODO: menu items // TODO: menu items
// undo close tab // UndoTabClose
// sep // sep
// BookmarkNew // BookmarkNew
// SaveAs // SaveAs
@ -1777,8 +1777,8 @@ _action_bookmark_edit_activate (GtkAction* action,
} }
static void static void
_action_trash_undo_activate (GtkAction* action, _action_undo_tab_close_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
MidoriBrowserPrivate* priv = browser->priv; MidoriBrowserPrivate* priv = browser->priv;
@ -1955,6 +1955,9 @@ static const GtkActionEntry entries[] = {
{ "TrashEmpty", GTK_STOCK_CLEAR, { "TrashEmpty", GTK_STOCK_CLEAR,
"Empty Trash", "", "Empty Trash", "",
"hm?", G_CALLBACK (_action_trash_empty_activate) }, "hm?", G_CALLBACK (_action_trash_empty_activate) },
{ "UndoTabClose", GTK_STOCK_UNDELETE,
"Undo Close Tab", "",
"hm?", G_CALLBACK (_action_undo_tab_close_activate) },
{ "Bookmarks", NULL, "_Bookmarks" }, { "Bookmarks", NULL, "_Bookmarks" },
{ "BookmarkNew", STOCK_BOOKMARK_NEW, { "BookmarkNew", STOCK_BOOKMARK_NEW,

10
src/midori-webview.c
View file

@ -447,12 +447,12 @@ gtk_widget_scroll_event (MidoriWebView* web_view,
return FALSE; return FALSE;
} }
static void /*static void
midori_web_view_menu_new_tab_activate (GtkWidget* action, midori_web_view_menu_new_tab_activate (GtkWidget* widget,
MidoriBrowser* browser) MidoriWebView* web_view)
{ {
// FIXME: Open a new tab and load the uri // FIXME: Open a new tab and load the uri
} }*/
static void static void
webkit_web_view_populate_popup_cb (GtkWidget* web_view, webkit_web_view_populate_popup_cb (GtkWidget* web_view,
@ -582,7 +582,7 @@ midori_web_view_init (MidoriWebView* web_view)
"signal::scroll-event", "signal::scroll-event",
gtk_widget_scroll_event, NULL, gtk_widget_scroll_event, NULL,
"signal::populate-popup", "signal::populate-popup",
webkit_web_view_populate_popup_cb, browser, webkit_web_view_populate_popup_cb, NULL,
NULL); NULL);
g_object_connect (web_frame, g_object_connect (web_frame,
"signal::load-done", "signal::load-done",