Xiphos

Merge lp://staging/~xnox/xiphos/restore-folder into lp://staging/~xiphos-devel/xiphos/trunk

  1. restore-folder
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~xnox/xiphos/restore-folder
Merge into: lp://staging/~xiphos-devel/xiphos/trunk
Diff against target: 129 lines (+0/-83)
3 files modified
src/gnome2/bookmarks_menu.c (+0/-60)
src/gui/bookmarks_menu.h (+0/-1)
ui/xi-menus.glade (+0/-22)
To merge this branch: bzr merge lp://staging/~xnox/xiphos/restore-folder
Reviewer Review Type Date Requested Status
Dmitrijs Ledkovs Daily Debs Pending
Review via email: mp+17616@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :
Download full text (5.5 KiB)

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_w...

Read more...

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

The reason I noted it, because it uses FileSelectionDialog which was
deprecated since gtk 2.4

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

LinkedIn
------------

I'd like to add you to my professional network on LinkedIn.

- Dmitrijs Ledkovs

Confirm that you know Dmitrijs Ledkovs
https://www.linkedin.com/e/isd/1067432956/0qiQ-eDU/

------
(c) 2010, LinkedIn Corporation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
503503
504/******************************************************************************504/******************************************************************************
505 * Name505 * Name
506 * on_restore_folder_activate
507 *
508 * Synopsis
509 * #include "gui/bookmarks_menu.h"
510 *
511 * void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data)
512 *
513 * Description
514 * restore a saved bookmark folder
515 *
516 * Return value
517 * void
518 */
519
520G_MODULE_EXPORT void on_restore_folder_activate(GtkMenuItem * menuitem,
521 gpointer user_data)
522{
523 GtkWidget *fileselection;
524 GtkWidget *ok;
525 GtkWidget *cancel;
526 gchar buf[256];
527
528 fileselection =
529 gtk_file_selection_new(_("Restore Bookmark Folder"));
530 gtk_container_set_border_width(GTK_CONTAINER(fileselection),
531 10);
532 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION
533 (fileselection));
534
535 ok = GTK_FILE_SELECTION(fileselection)->ok_button;
536 gtk_object_set_data(GTK_OBJECT(fileselection), "ok", ok);
537 gtk_widget_show(ok);
538 GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
539
540 cancel = GTK_FILE_SELECTION(fileselection)->cancel_button;
541 gtk_object_set_data(GTK_OBJECT(fileselection), "cancel",
542 cancel);
543 gtk_widget_show(cancel);
544 GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
545
546 sprintf(buf, "%s/removed/*.xml", settings.swbmDir);
547 gtk_file_selection_set_filename(GTK_FILE_SELECTION
548 (fileselection), buf);
549
550 gtk_widget_show(fileselection);
551
552 g_signal_connect(GTK_OBJECT(ok), "clicked",
553 GTK_SIGNAL_FUNC(restore_ok),
554 (GtkWidget *) fileselection);
555 g_signal_connect(GTK_OBJECT(cancel), "clicked",
556 GTK_SIGNAL_FUNC(restore_cancel),
557 (GtkWidget *) fileselection);
558
559}
560
561
562/******************************************************************************
563 * Name
564 * on_delete_item_activate506 * on_delete_item_activate
565 *507 *
566 * Synopsis508 * Synopsis
@@ -979,7 +921,6 @@
979 //menu.rr_submenu = glade_xml_get_widget (gxml, "remove_restore"); // pmBookmarkTree_uiinfo[13].widget;921 //menu.rr_submenu = glade_xml_get_widget (gxml, "remove_restore"); // pmBookmarkTree_uiinfo[13].widget;
980922
981 menu.remove = glade_xml_get_widget (gxml, "remove_folder"); // rr_menu_uiinfo[0].widget;923 menu.remove = glade_xml_get_widget (gxml, "remove_folder"); // rr_menu_uiinfo[0].widget;
982 menu.restore = glade_xml_get_widget (gxml, "restore_folder"); // rr_menu_uiinfo[2].widget;
983924
984 gtk_widget_set_sensitive(menu.in_tab, FALSE);925 gtk_widget_set_sensitive(menu.in_tab, FALSE);
985 gtk_widget_set_sensitive(menu.in_dialog, FALSE);926 gtk_widget_set_sensitive(menu.in_dialog, FALSE);
@@ -993,7 +934,6 @@
993 gtk_widget_set_sensitive(menu.remove, TRUE);934 gtk_widget_set_sensitive(menu.remove, TRUE);
994 gtk_widget_set_sensitive(menu.restore, TRUE);935 gtk_widget_set_sensitive(menu.restore, TRUE);
995 //gtk_widget_hide(menu.remove);936 //gtk_widget_hide(menu.remove);
996 gtk_widget_hide(menu.restore);
997 937
998 /* connect signals and data */938 /* connect signals and data */
999 glade_xml_signal_autoconnect_full939 glade_xml_signal_autoconnect_full
1000940
=== 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 @@
59void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data);59void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
60void restore_ok(GtkButton * button, GtkWidget * filesel);60void restore_ok(GtkButton * button, GtkWidget * filesel);
61void restore_cancel(GtkButton * button, GtkWidget * dlg);61void restore_cancel(GtkButton * button, GtkWidget * dlg);
62void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
63void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data);62void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data);
64void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data);63void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data);
65void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data);64void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data);
6665
=== 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 @@
1566 </child>1566 </child>
1567 </widget>1567 </widget>
1568 </child>1568 </child>
1569
1570 <child>
1571 <widget class="GtkImageMenuItem" id="restore_folder">
1572 <property name="visible">True</property>
1573 <property name="tooltip" translatable="yes">Restore saved folder</property>
1574 <property name="label" translatable="yes">Restore Folder</property>
1575 <property name="use_underline">True</property>
1576 <signal name="activate" handler="on_restore_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
1577
1578 <child internal-child="image">
1579 <widget class="GtkImage" id="image1479">
1580 <property name="visible">True</property>
1581 <property name="stock">gtk-goto-top</property>
1582 <property name="icon_size">1</property>
1583 <property name="xalign">0.5</property>
1584 <property name="yalign">0.5</property>
1585 <property name="xpad">0</property>
1586 <property name="ypad">0</property>
1587 </widget>
1588 </child>
1589 </widget>
1590 </child>
1591</widget>1569</widget>
15921570
1593<widget class="GtkMenu" id="menu_modules">1571<widget class="GtkMenu" id="menu_modules">

Subscribers

People subscribed via source and target branches

to all changes: