Is this ok to push to trunk? Looks like restore-folder is not used anymore.
For a nice webinterface to view the patch see
https://code.launchpad.net/~dmitrij.ledkov/xiphos/restore-folder/+merge/17616
Mergre proposal follows
Dmitrijs Ledkovs has proposed merging
lp:~dmitrij.ledkov/xiphos/restore-folder into lp:xiphos.
--
https://code.launchpad.net/~dmitrij.ledkov/xiphos/restore-folder/+merge/17616
You are requested to review the proposed merge of
lp:~dmitrij.ledkov/xiphos/restore-folder into lp:xiphos.
=== modified file 'src/gnome2/bookmarks_menu.c'
--- src/gnome2/bookmarks_menu.c 2010-01-07 02:30:28 +0000
+++ src/gnome2/bookmarks_menu.c 2010-01-18 20:05:23 +0000
@@ -503,64 +503,6 @@
/******************************************************************************
* Name
- * on_restore_folder_activate
- *
- * Synopsis
- * #include "gui/bookmarks_menu.h"
- *
- * void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer
user_data)
- *
- * Description
- * restore a saved bookmark folder
- *
- * Return value
- * void
- */
-
-G_MODULE_EXPORT void on_restore_folder_activate(GtkMenuItem * menuitem,
- gpointer user_data)
-{
- GtkWidget *fileselection;
- GtkWidget *ok;
- GtkWidget *cancel;
- gchar buf[256];
-
- fileselection =
- gtk_file_selection_new(_("Restore Bookmark Folder"));
- gtk_container_set_border_width(GTK_CONTAINER(fileselection),
- 10);
- gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION
- (fileselection));
-
- ok = GTK_FILE_SELECTION(fileselection)->ok_button;
- gtk_object_set_data(GTK_OBJECT(fileselection), "ok", ok);
- gtk_widget_show(ok);
- GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
-
- cancel = GTK_FILE_SELECTION(fileselection)->cancel_button;
- gtk_object_set_data(GTK_OBJECT(fileselection), "cancel",
- cancel);
- gtk_widget_show(cancel);
- GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
-
- sprintf(buf, "%s/removed/*.xml", settings.swbmDir);
- gtk_file_selection_set_filename(GTK_FILE_SELECTION
- (fileselection), buf);
-
- gtk_widget_show(fileselection);
-
- g_signal_connect(GTK_OBJECT(ok), "clicked",
- GTK_SIGNAL_FUNC(restore_ok),
- (GtkWidget *) fileselection);
- g_signal_connect(GTK_OBJECT(cancel), "clicked",
- GTK_SIGNAL_FUNC(restore_cancel),
- (GtkWidget *) fileselection);
-
-}
-
-
-/******************************************************************************
- * Name
* on_delete_item_activate
*
* Synopsis
@@ -979,7 +921,6 @@
//menu.rr_submenu = glade_xml_get_widget (gxml,
"remove_restore"); // pmBookmarkTree_uiinfo[13].widget;
menu.remove = glade_xml_get_widget (gxml, "remove_folder"); //
rr_menu_uiinfo[0].widget;
- menu.restore = glade_xml_get_widget (gxml, "restore_folder");
// rr_menu_uiinfo[2].widget;
gtk_widget_set_sensitive(menu.in_tab, FALSE);
gtk_widget_set_sensitive(menu.in_dialog, FALSE);
@@ -993,7 +934,6 @@
gtk_widget_set_sensitive(menu.remove, TRUE);
gtk_widget_set_sensitive(menu.restore, TRUE);
//gtk_widget_hide(menu.remove);
- gtk_widget_hide(menu.restore);
/* connect signals and data */
glade_xml_signal_autoconnect_full
=== modified file 'src/gui/bookmarks_menu.h'
--- src/gui/bookmarks_menu.h 2009-11-10 21:30:27 +0000
+++ src/gui/bookmarks_menu.h 2010-01-18 20:05:23 +0000
@@ -59,7 +59,6 @@
void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
void restore_ok(GtkButton * button, GtkWidget * filesel);
void restore_cancel(GtkButton * button, GtkWidget * dlg);
-void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data);
void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data);
void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data);
=== modified file 'ui/xi-menus.glade'
--- ui/xi-menus.glade 2010-01-05 01:51:02 +0000
+++ ui/xi-menus.glade 2010-01-18 20:05:23 +0000
@@ -1566,28 +1566,6 @@
-
-
-
-