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
1=== modified file 'src/gnome2/bookmarks_menu.c'
2--- src/gnome2/bookmarks_menu.c 2010-01-07 02:30:28 +0000
3+++ src/gnome2/bookmarks_menu.c 2010-01-18 20:05:23 +0000
4@@ -503,64 +503,6 @@
5
6 /******************************************************************************
7 * Name
8- * on_restore_folder_activate
9- *
10- * Synopsis
11- * #include "gui/bookmarks_menu.h"
12- *
13- * void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data)
14- *
15- * Description
16- * restore a saved bookmark folder
17- *
18- * Return value
19- * void
20- */
21-
22-G_MODULE_EXPORT void on_restore_folder_activate(GtkMenuItem * menuitem,
23- gpointer user_data)
24-{
25- GtkWidget *fileselection;
26- GtkWidget *ok;
27- GtkWidget *cancel;
28- gchar buf[256];
29-
30- fileselection =
31- gtk_file_selection_new(_("Restore Bookmark Folder"));
32- gtk_container_set_border_width(GTK_CONTAINER(fileselection),
33- 10);
34- gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION
35- (fileselection));
36-
37- ok = GTK_FILE_SELECTION(fileselection)->ok_button;
38- gtk_object_set_data(GTK_OBJECT(fileselection), "ok", ok);
39- gtk_widget_show(ok);
40- GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
41-
42- cancel = GTK_FILE_SELECTION(fileselection)->cancel_button;
43- gtk_object_set_data(GTK_OBJECT(fileselection), "cancel",
44- cancel);
45- gtk_widget_show(cancel);
46- GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
47-
48- sprintf(buf, "%s/removed/*.xml", settings.swbmDir);
49- gtk_file_selection_set_filename(GTK_FILE_SELECTION
50- (fileselection), buf);
51-
52- gtk_widget_show(fileselection);
53-
54- g_signal_connect(GTK_OBJECT(ok), "clicked",
55- GTK_SIGNAL_FUNC(restore_ok),
56- (GtkWidget *) fileselection);
57- g_signal_connect(GTK_OBJECT(cancel), "clicked",
58- GTK_SIGNAL_FUNC(restore_cancel),
59- (GtkWidget *) fileselection);
60-
61-}
62-
63-
64-/******************************************************************************
65- * Name
66 * on_delete_item_activate
67 *
68 * Synopsis
69@@ -979,7 +921,6 @@
70 //menu.rr_submenu = glade_xml_get_widget (gxml, "remove_restore"); // pmBookmarkTree_uiinfo[13].widget;
71
72 menu.remove = glade_xml_get_widget (gxml, "remove_folder"); // rr_menu_uiinfo[0].widget;
73- menu.restore = glade_xml_get_widget (gxml, "restore_folder"); // rr_menu_uiinfo[2].widget;
74
75 gtk_widget_set_sensitive(menu.in_tab, FALSE);
76 gtk_widget_set_sensitive(menu.in_dialog, FALSE);
77@@ -993,7 +934,6 @@
78 gtk_widget_set_sensitive(menu.remove, TRUE);
79 gtk_widget_set_sensitive(menu.restore, TRUE);
80 //gtk_widget_hide(menu.remove);
81- gtk_widget_hide(menu.restore);
82
83 /* connect signals and data */
84 glade_xml_signal_autoconnect_full
85
86=== modified file 'src/gui/bookmarks_menu.h'
87--- src/gui/bookmarks_menu.h 2009-11-10 21:30:27 +0000
88+++ src/gui/bookmarks_menu.h 2010-01-18 20:05:23 +0000
89@@ -59,7 +59,6 @@
90 void on_export_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
91 void restore_ok(GtkButton * button, GtkWidget * filesel);
92 void restore_cancel(GtkButton * button, GtkWidget * dlg);
93-void on_restore_folder_activate(GtkMenuItem * menuitem, gpointer user_data);
94 void on_delete_item_activate(GtkMenuItem * menuitem, gpointer user_data);
95 void on_expand_activate(GtkMenuItem * menuitem, gpointer user_data);
96 void on_collapse_activate(GtkMenuItem * menuitem, gpointer user_data);
97
98=== modified file 'ui/xi-menus.glade'
99--- ui/xi-menus.glade 2010-01-05 01:51:02 +0000
100+++ ui/xi-menus.glade 2010-01-18 20:05:23 +0000
101@@ -1566,28 +1566,6 @@
102 </child>
103 </widget>
104 </child>
105-
106- <child>
107- <widget class="GtkImageMenuItem" id="restore_folder">
108- <property name="visible">True</property>
109- <property name="tooltip" translatable="yes">Restore saved folder</property>
110- <property name="label" translatable="yes">Restore Folder</property>
111- <property name="use_underline">True</property>
112- <signal name="activate" handler="on_restore_folder_activate" last_modification_time="Tue, 07 Apr 2009 23:56:38 GMT"/>
113-
114- <child internal-child="image">
115- <widget class="GtkImage" id="image1479">
116- <property name="visible">True</property>
117- <property name="stock">gtk-goto-top</property>
118- <property name="icon_size">1</property>
119- <property name="xalign">0.5</property>
120- <property name="yalign">0.5</property>
121- <property name="xpad">0</property>
122- <property name="ypad">0</property>
123- </widget>
124- </child>
125- </widget>
126- </child>
127 </widget>
128
129 <widget class="GtkMenu" id="menu_modules">

Subscribers

People subscribed via source and target branches

to all changes: