aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-02-02 23:53:25 +0000
committerChristian Grothoff <christian@grothoff.org>2012-02-02 23:53:25 +0000
commite6ac82d02fd31b5974816e7f6b8a29cdb7cd3a86 (patch)
tree64088d3bd03d9b671a852adfe2eff966bec0941e
parentb160144c9e0a24f8a53edce72a33adcd6df5652f (diff)
downloadgnunet-gtk-e6ac82d02fd31b5974816e7f6b8a29cdb7cd3a86.tar.gz
gnunet-gtk-e6ac82d02fd31b5974816e7f6b8a29cdb7cd3a86.zip
-fixing delete event handlers
Diffstat
-rw-r--r--contrib/gnunet_fs_gtk_download_as_dialog.glade109
-rw-r--r--contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade95
-rw-r--r--src/fs/gnunet-fs-gtk_advertise-pseudonym.c7
-rw-r--r--src/fs/gnunet-fs-gtk_download-save-as.c5
-rw-r--r--src/fs/gnunet-fs-gtk_open-uri.c2
-rw-r--r--src/fs/gnunet-fs-gtk_publish-dialog.c6
-rw-r--r--src/fs/gnunet-fs-gtk_publish-edit-dialog.c6
7 files changed, 105 insertions, 125 deletions
diff --git a/contrib/gnunet_fs_gtk_download_as_dialog.glade b/contrib/gnunet_fs_gtk_download_as_dialog.glade
index 8f1cf970..1ee0593b 100644
--- a/contrib/gnunet_fs_gtk_download_as_dialog.glade
+++ b/contrib/gnunet_fs_gtk_download_as_dialog.glade
@@ -1,15 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy project-wide --> 4 <!-- interface-naming-policy project-wide -->
5 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
6 <property name="upper">100000</property>
7 <property name="value">1</property> 6 <property name="value">1</property>
7 <property name="upper">100000</property>
8 <property name="step_increment">1</property> 8 <property name="step_increment">1</property>
9 <property name="page_increment">10</property> 9 <property name="page_increment">10</property>
10 </object> 10 </object>
11 <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog"> 11 <object class="GtkFileChooserDialog" id="GNUNET_GTK_save_as_dialog">
12 <property name="can_focus">False</property>
13 <property name="can_default">True</property> 12 <property name="can_default">True</property>
14 <property name="has_default">True</property> 13 <property name="has_default">True</property>
15 <property name="border_width">5</property> 14 <property name="border_width">5</property>
@@ -18,76 +17,28 @@
18 <property name="destroy_with_parent">True</property> 17 <property name="destroy_with_parent">True</property>
19 <property name="icon_name">document-save-as</property> 18 <property name="icon_name">document-save-as</property>
20 <property name="type_hint">dialog</property> 19 <property name="type_hint">dialog</property>
21 <property name="action">save</property>
22 <property name="preview_widget_active">False</property> 20 <property name="preview_widget_active">False</property>
21 <property name="action">save</property>
23 <property name="use_preview_label">False</property> 22 <property name="use_preview_label">False</property>
24 <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb" swapped="no"/> 23 <signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb"/>
24 <signal name="delete_event" handler="GNUNET_GTK_save_as_dialog_delete_event_cb"/>
25 <child internal-child="vbox"> 25 <child internal-child="vbox">
26 <object class="GtkVBox" id="dialog-vbox4"> 26 <object class="GtkVBox" id="dialog-vbox4">
27 <property name="visible">True</property> 27 <property name="visible">True</property>
28 <property name="can_focus">False</property> 28 <property name="orientation">vertical</property>
29 <property name="spacing">2</property> 29 <property name="spacing">2</property>
30 <child internal-child="action_area">
31 <object class="GtkHButtonBox" id="dialog-action_area5">
32 <property name="visible">True</property>
33 <property name="can_focus">False</property>
34 <property name="layout_style">end</property>
35 <child>
36 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_cancel_button">
37 <property name="label">gtk-cancel</property>
38 <property name="use_action_appearance">False</property>
39 <property name="visible">True</property>
40 <property name="can_focus">True</property>
41 <property name="receives_default">False</property>
42 <property name="use_stock">True</property>
43 </object>
44 <packing>
45 <property name="expand">False</property>
46 <property name="fill">False</property>
47 <property name="position">0</property>
48 </packing>
49 </child>
50 <child>
51 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_ok_button">
52 <property name="label">gtk-save</property>
53 <property name="use_action_appearance">False</property>
54 <property name="visible">True</property>
55 <property name="can_focus">True</property>
56 <property name="can_default">True</property>
57 <property name="has_default">True</property>
58 <property name="receives_default">True</property>
59 <property name="use_stock">True</property>
60 </object>
61 <packing>
62 <property name="expand">False</property>
63 <property name="fill">False</property>
64 <property name="position">1</property>
65 </packing>
66 </child>
67 </object>
68 <packing>
69 <property name="expand">False</property>
70 <property name="fill">True</property>
71 <property name="pack_type">end</property>
72 <property name="position">0</property>
73 </packing>
74 </child>
75 <child> 30 <child>
76 <object class="GtkHBox" id="hbox2"> 31 <object class="GtkHBox" id="hbox2">
77 <property name="visible">True</property> 32 <property name="visible">True</property>
78 <property name="can_focus">False</property>
79 <child> 33 <child>
80 <object class="GtkLabel" id="GNUNET_GTK_save_as_dialog_anonymity_label"> 34 <object class="GtkLabel" id="GNUNET_GTK_save_as_dialog_anonymity_label">
81 <property name="visible">True</property> 35 <property name="visible">True</property>
82 <property name="can_focus">False</property>
83 <property name="label" translatable="yes">_Anonymity:</property> 36 <property name="label" translatable="yes">_Anonymity:</property>
84 <property name="use_underline">True</property> 37 <property name="use_underline">True</property>
85 <property name="selectable">True</property> 38 <property name="selectable">True</property>
86 <property name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property> 39 <property name="mnemonic_widget">GNUNET_GTK_save_as_dialog_anonymity_spin_button</property>
87 </object> 40 </object>
88 <packing> 41 <packing>
89 <property name="expand">True</property>
90 <property name="fill">True</property>
91 <property name="position">0</property> 42 <property name="position">0</property>
92 </packing> 43 </packing>
93 </child> 44 </child>
@@ -95,15 +46,13 @@
95 <object class="GtkSpinButton" id="GNUNET_GTK_save_as_dialog_anonymity_spin_button"> 46 <object class="GtkSpinButton" id="GNUNET_GTK_save_as_dialog_anonymity_spin_button">
96 <property name="visible">True</property> 47 <property name="visible">True</property>
97 <property name="can_focus">True</property> 48 <property name="can_focus">True</property>
98 <property name="invisible_char">●</property> 49 <property name="invisible_char">&#x25CF;</property>
99 <property name="caps_lock_warning">False</property> 50 <property name="caps_lock_warning">False</property>
100 <property name="primary_icon_activatable">False</property>
101 <property name="secondary_icon_activatable">False</property>
102 <property name="primary_icon_sensitive">True</property> 51 <property name="primary_icon_sensitive">True</property>
103 <property name="secondary_icon_sensitive">True</property> 52 <property name="secondary_icon_sensitive">True</property>
104 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property> 53 <property name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
105 <property name="numeric">True</property> 54 <property name="numeric">True</property>
106 <signal name="value-changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes" swapped="no"/> 55 <signal name="value_changed" handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes"/>
107 </object> 56 </object>
108 <packing> 57 <packing>
109 <property name="expand">False</property> 58 <property name="expand">False</property>
@@ -114,7 +63,6 @@
114 <child> 63 <child>
115 <object class="GtkCheckButton" id="GNUNET_GTK_save_as_recursive_check_button"> 64 <object class="GtkCheckButton" id="GNUNET_GTK_save_as_recursive_check_button">
116 <property name="label" translatable="yes">_recursive</property> 65 <property name="label" translatable="yes">_recursive</property>
117 <property name="use_action_appearance">False</property>
118 <property name="visible">True</property> 66 <property name="visible">True</property>
119 <property name="sensitive">False</property> 67 <property name="sensitive">False</property>
120 <property name="can_focus">True</property> 68 <property name="can_focus">True</property>
@@ -136,6 +84,47 @@
136 <property name="position">2</property> 84 <property name="position">2</property>
137 </packing> 85 </packing>
138 </child> 86 </child>
87 <child internal-child="action_area">
88 <object class="GtkHButtonBox" id="dialog-action_area5">
89 <property name="visible">True</property>
90 <property name="layout_style">end</property>
91 <child>
92 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_cancel_button">
93 <property name="label">gtk-cancel</property>
94 <property name="visible">True</property>
95 <property name="can_focus">True</property>
96 <property name="receives_default">False</property>
97 <property name="use_stock">True</property>
98 </object>
99 <packing>
100 <property name="expand">False</property>
101 <property name="fill">False</property>
102 <property name="position">0</property>
103 </packing>
104 </child>
105 <child>
106 <object class="GtkButton" id="GNUNET_GTK_save_as_dialog_ok_button">
107 <property name="label">gtk-save</property>
108 <property name="visible">True</property>
109 <property name="can_focus">True</property>
110 <property name="can_default">True</property>
111 <property name="has_default">True</property>
112 <property name="receives_default">True</property>
113 <property name="use_stock">True</property>
114 </object>
115 <packing>
116 <property name="expand">False</property>
117 <property name="fill">False</property>
118 <property name="position">1</property>
119 </packing>
120 </child>
121 </object>
122 <packing>
123 <property name="expand">False</property>
124 <property name="pack_type">end</property>
125 <property name="position">0</property>
126 </packing>
127 </child>
139 </object> 128 </object>
140 </child> 129 </child>
141 <action-widgets> 130 <action-widgets>
diff --git a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade b/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
index e8b82388..898e9e5e 100644
--- a/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
+++ b/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
@@ -1,6 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0"?>
2<interface> 2<interface>
3 <requires lib="gtk+" version="2.20"/> 3 <requires lib="gtk+" version="2.20"/>
4 <!-- interface-naming-policy toplevel-contextual -->
4 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore"> 5 <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
5 <columns> 6 <columns>
6 <!-- column-name namespace_name --> 7 <!-- column-name namespace_name -->
@@ -22,31 +23,63 @@
22 <property name="page_size">10</property> 23 <property name="page_size">10</property>
23 </object> 24 </object>
24 <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog"> 25 <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
25 <property name="can_focus">False</property>
26 <property name="border_width">5</property> 26 <property name="border_width">5</property>
27 <property name="title" translatable="yes">Select pseudonym...</property> 27 <property name="title" translatable="yes">Select pseudonym...</property>
28 <property name="modal">True</property> 28 <property name="modal">True</property>
29 <property name="type_hint">normal</property> 29 <property name="type_hint">normal</property>
30 <signal name="response" handler="GNUNET_GTK_select_pseudonym_dialog_response_cb" swapped="no"/> 30 <signal name="response" handler="GNUNET_GTK_select_pseudonym_dialog_response_cb"/>
31 <signal name="delete_event" handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb"/>
31 <child internal-child="vbox"> 32 <child internal-child="vbox">
32 <object class="GtkBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox"> 33 <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
33 <property name="visible">True</property> 34 <property name="visible">True</property>
34 <property name="can_focus">False</property>
35 <property name="orientation">vertical</property> 35 <property name="orientation">vertical</property>
36 <property name="spacing">2</property> 36 <property name="spacing">2</property>
37 <child>
38 <object class="GtkScrolledWindow" id="GNUNET_GTK_select_pseudonym_scrolledwindow">
39 <property name="visible">True</property>
40 <property name="can_focus">True</property>
41 <property name="hadjustment">adjustment1</property>
42 <property name="vadjustment">adjustment2</property>
43 <child>
44 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view">
45 <property name="visible">True</property>
46 <property name="can_focus">True</property>
47 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
48 <property name="hadjustment">adjustment1</property>
49 <property name="vadjustment">adjustment2</property>
50 <child>
51 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column">
52 <property name="title">Name</property>
53 <property name="expand">True</property>
54 <property name="clickable">True</property>
55 <property name="reorderable">True</property>
56 <property name="sort_indicator">True</property>
57 <property name="sort_column_id">0</property>
58 <child>
59 <object class="GtkCellRendererText" id="GNUNET_GTK_select_pseudonym_name_renderer"/>
60 <attributes>
61 <attribute name="text">0</attribute>
62 </attributes>
63 </child>
64 </object>
65 </child>
66 </object>
67 </child>
68 </object>
69 <packing>
70 <property name="position">1</property>
71 </packing>
72 </child>
37 <child internal-child="action_area"> 73 <child internal-child="action_area">
38 <object class="GtkButtonBox" id="GNUNET_GTK_select_pseudonym_dialog_action_area"> 74 <object class="GtkHButtonBox" id="GNUNET_GTK_select_pseudonym_dialog_action_area">
39 <property name="visible">True</property> 75 <property name="visible">True</property>
40 <property name="can_focus">False</property>
41 <property name="layout_style">end</property> 76 <property name="layout_style">end</property>
42 <child> 77 <child>
43 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_cancel_button"> 78 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_cancel_button">
44 <property name="label">gtk-cancel</property> 79 <property name="label">gtk-cancel</property>
45 <property name="use_action_appearance">False</property>
46 <property name="visible">True</property> 80 <property name="visible">True</property>
47 <property name="can_focus">True</property> 81 <property name="can_focus">True</property>
48 <property name="receives_default">True</property> 82 <property name="receives_default">True</property>
49 <property name="use_action_appearance">False</property>
50 <property name="use_stock">True</property> 83 <property name="use_stock">True</property>
51 </object> 84 </object>
52 <packing> 85 <packing>
@@ -58,12 +91,10 @@
58 <child> 91 <child>
59 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_ok_button"> 92 <object class="GtkButton" id="GNUNET_GTK_select_pseudonym_ok_button">
60 <property name="label">gtk-ok</property> 93 <property name="label">gtk-ok</property>
61 <property name="use_action_appearance">False</property>
62 <property name="visible">True</property> 94 <property name="visible">True</property>
63 <property name="sensitive">False</property> 95 <property name="sensitive">False</property>
64 <property name="can_focus">True</property> 96 <property name="can_focus">True</property>
65 <property name="receives_default">True</property> 97 <property name="receives_default">True</property>
66 <property name="use_action_appearance">False</property>
67 <property name="use_stock">True</property> 98 <property name="use_stock">True</property>
68 </object> 99 </object>
69 <packing> 100 <packing>
@@ -75,52 +106,10 @@
75 </object> 106 </object>
76 <packing> 107 <packing>
77 <property name="expand">False</property> 108 <property name="expand">False</property>
78 <property name="fill">True</property>
79 <property name="pack_type">end</property> 109 <property name="pack_type">end</property>
80 <property name="position">0</property> 110 <property name="position">0</property>
81 </packing> 111 </packing>
82 </child> 112 </child>
83 <child>
84 <object class="GtkScrolledWindow" id="GNUNET_GTK_select_pseudonym_scrolledwindow">
85 <property name="visible">True</property>
86 <property name="can_focus">True</property>
87 <property name="hadjustment">adjustment1</property>
88 <property name="vadjustment">adjustment2</property>
89 <child>
90 <object class="GtkTreeView" id="GNUNET_GTK_select_pseudonym_tree_view">
91 <property name="visible">True</property>
92 <property name="can_focus">True</property>
93 <property name="hadjustment">adjustment1</property>
94 <property name="vadjustment">adjustment2</property>
95 <property name="model">GNUNET_GTK_select_pseudonym_liststore</property>
96 <child internal-child="selection">
97 <object class="GtkTreeSelection" id="treeview-selection1"/>
98 </child>
99 <child>
100 <object class="GtkTreeViewColumn" id="GNUNET_GTK_select_pseudonym_tree_view_column">
101 <property name="title" translatable="yes">Name</property>
102 <property name="expand">True</property>
103 <property name="clickable">True</property>
104 <property name="reorderable">True</property>
105 <property name="sort_indicator">True</property>
106 <property name="sort_column_id">0</property>
107 <child>
108 <object class="GtkCellRendererText" id="GNUNET_GTK_select_pseudonym_name_renderer"/>
109 <attributes>
110 <attribute name="text">0</attribute>
111 </attributes>
112 </child>
113 </object>
114 </child>
115 </object>
116 </child>
117 </object>
118 <packing>
119 <property name="expand">True</property>
120 <property name="fill">True</property>
121 <property name="position">1</property>
122 </packing>
123 </child>
124 </object> 113 </object>
125 </child> 114 </child>
126 <action-widgets> 115 <action-widgets>
diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 2af42833..1aad22f3 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -199,7 +199,7 @@ GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
199 * @param widget the dialog 199 * @param widget the dialog
200 * @param event the destroying event 200 * @param event the destroying event
201 * @param user_data the builder of the dialog 201 * @param user_data the builder of the dialog
202 * @return TRUE (allow destruction) 202 * @return FALSE (allow destruction)
203 */ 203 */
204gboolean 204gboolean
205GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget, 205GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
@@ -210,7 +210,6 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
210 GtkTreeModel *tm; 210 GtkTreeModel *tm;
211 GtkTreeIter iter; 211 GtkTreeIter iter;
212 212
213 fprintf (stderr, "DELETE!\n");
214 tm = GTK_TREE_MODEL (gtk_builder_get_object (builder, 213 tm = GTK_TREE_MODEL (gtk_builder_get_object (builder,
215 "GNUNET_GTK_select_pseudonym_liststore")); 214 "GNUNET_GTK_select_pseudonym_liststore"));
216 if (gtk_tree_model_get_iter_first (tm, &iter)) 215 if (gtk_tree_model_get_iter_first (tm, &iter))
@@ -225,7 +224,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
225 while (gtk_tree_model_iter_next (tm, &iter)); 224 while (gtk_tree_model_iter_next (tm, &iter));
226 } 225 }
227 g_object_unref (G_OBJECT (builder)); 226 g_object_unref (G_OBJECT (builder));
228 return TRUE; 227 return FALSE;
229} 228}
230 229
231 230
@@ -314,7 +313,7 @@ GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
314 &add_to_list, 313 &add_to_list,
315 ls); 314 ls);
316 315
317 /* FIXME-UNCLEAN: this signal can be connected by (modern) Glade automatically */ 316 /* FIXME-GTK3: this signal can be connected by (modern) Glade automatically */
318 tv = GTK_TREE_VIEW (gtk_builder_get_object 317 tv = GTK_TREE_VIEW (gtk_builder_get_object
319 (builder, "GNUNET_GTK_select_pseudonym_tree_view")); 318 (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
320 sel = gtk_tree_view_get_selection (tv); 319 sel = gtk_tree_view_get_selection (tv);
diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 170f1bc9..1cd45e8d 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -84,7 +84,7 @@ save_as_dialog_free_download_context (struct DownloadContext *dc)
84 * @param widget the dialog object 84 * @param widget the dialog object
85 * @param event the deletion event 85 * @param event the deletion event
86 * @param user_data the 'structDownloadAsDialogContext' of the dialog 86 * @param user_data the 'structDownloadAsDialogContext' of the dialog
87 * @return always FALSE 87 * @return always FALSE (destroy the window)
88 */ 88 */
89gboolean 89gboolean
90GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event, 90GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
@@ -106,6 +106,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
106 GNUNET_free (dlc); 106 GNUNET_free (dlc);
107 return FALSE; 107 return FALSE;
108 } 108 }
109 /* FIXME-UGLY: this code should be in the 'save_as_dialog_response_cb' instead */
109 GNUNET_free_non_null (dc->filename); 110 GNUNET_free_non_null (dc->filename);
110 dc->filename = 111 dc->filename =
111 GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog)); 112 GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog));
@@ -143,6 +144,8 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
143 dlc->response = response_id; 144 dlc->response = response_id;
144 /* dialogs don't get delete-event the way normal windows do, 145 /* dialogs don't get delete-event the way normal windows do,
145 call the handler manually */ 146 call the handler manually */
147 /* FIXME-UGLY: this is a bit ugly; instead, move the code
148 to close the dialog nicely into here! */
146 GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL, 149 GNUNET_GTK_save_as_dialog_delete_event_cb (GTK_WIDGET (dialog), NULL,
147 user_data); 150 user_data);
148 gtk_widget_destroy (GTK_WIDGET (dialog)); 151 gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/src/fs/gnunet-fs-gtk_open-uri.c b/src/fs/gnunet-fs-gtk_open-uri.c
index 1b146c9f..90235c76 100644
--- a/src/fs/gnunet-fs-gtk_open-uri.c
+++ b/src/fs/gnunet-fs-gtk_open-uri.c
@@ -138,7 +138,7 @@ GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb (GtkButton * button,
138 * @param widget the window 138 * @param widget the window
139 * @param event the deletion event 139 * @param event the deletion event
140 * @param user_data the 'GtkBuilder' of the URI dialog 140 * @param user_data the 'GtkBuilder' of the URI dialog
141 * @return TRUE (allow destruction) 141 * @return FALSE (allow destruction)
142 */ 142 */
143gboolean 143gboolean
144GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget, 144GNUNET_GTK_open_url_window_delete_event_cb (GtkWidget * widget,
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index c57ab9d8..4f33fc62 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -904,7 +904,7 @@ GNUNET_FS_GTK_progress_dialog_cancel_button_clicked_cb (GtkButton *button,
904 * @param widget the widget emitting the event 904 * @param widget the widget emitting the event
905 * @param event the event 905 * @param event the event
906 * @param user_data progress dialog context of our window 906 * @param user_data progress dialog context of our window
907 * @return FALSE to refuse to close 907 * @return TRUE to refuse to close
908 */ 908 */
909gboolean 909gboolean
910GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget, 910GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget,
@@ -912,7 +912,7 @@ GNUNET_FS_GTK_progress_dialog_delete_event_cb (GtkWidget *widget,
912 void *cls) 912 void *cls)
913{ 913{
914 /* Don't allow GTK to kill the window, until the scan is finished */ 914 /* Don't allow GTK to kill the window, until the scan is finished */
915 return FALSE; 915 return TRUE;
916} 916}
917 917
918 918
@@ -1982,7 +1982,7 @@ GNUNET_GTK_main_menu_file_publish_activate_cb (GtkWidget * dummy, gpointer user_
1982 ctx->pseudonym_selection = gtk_tree_view_get_selection (pseudonym_treeview); 1982 ctx->pseudonym_selection = gtk_tree_view_get_selection (pseudonym_treeview);
1983 ctx->pseudonym_treemodel = gtk_tree_view_get_model (pseudonym_treeview); 1983 ctx->pseudonym_treemodel = gtk_tree_view_get_model (pseudonym_treeview);
1984 1984
1985 /* connect signals; FIXME-UNCLEAN: these could be connected with (modern) Glade */ 1985 /* connect signals; FIXME-GTK3: these could be connected with (modern) Glade */
1986 g_signal_connect (G_OBJECT (ctx->file_info_selection), "changed", 1986 g_signal_connect (G_OBJECT (ctx->file_info_selection), "changed",
1987 G_CALLBACK (selection_changed_cb), ctx); 1987 G_CALLBACK (selection_changed_cb), ctx);
1988 g_signal_connect (G_OBJECT (ctx->pseudonym_selection), "changed", 1988 g_signal_connect (G_OBJECT (ctx->pseudonym_selection), "changed",
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 0951b316..6d9a641c 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -253,7 +253,7 @@ GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox * widget,
253 * @param ts the tree selection object 253 * @param ts the tree selection object
254 * @param user_data the 'struct EditPublicationDialogContext' 254 * @param user_data the 'struct EditPublicationDialogContext'
255 */ 255 */
256/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */ 256/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
257static void 257static void
258metadata_selection_changed_cb (GtkTreeSelection *ts, 258metadata_selection_changed_cb (GtkTreeSelection *ts,
259 gpointer user_data) 259 gpointer user_data)
@@ -502,7 +502,7 @@ GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb (Gt
502 * @param ts the tree selection object 502 * @param ts the tree selection object
503 * @param user_data the 'struct EditPublicationDialogContext' 503 * @param user_data the 'struct EditPublicationDialogContext'
504 */ 504 */
505/* FIXME-UNCLEAN: connect this signal via glade (modern versions of Glade support this) */ 505/* FIXME-GTK3: connect this signal via glade (modern versions of Glade support this) */
506static void 506static void
507keywords_selection_changed_cb (GtkTreeSelection *ts, 507keywords_selection_changed_cb (GtkTreeSelection *ts,
508 gpointer user_data) 508 gpointer user_data)
@@ -1152,7 +1152,7 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkWindow * parent,
1152 gtk_widget_set_visible (GTK_WIDGET (root_label), 1152 gtk_widget_set_visible (GTK_WIDGET (root_label),
1153 is_namespace_edit ? TRUE : FALSE); 1153 is_namespace_edit ? TRUE : FALSE);
1154 1154
1155 /* FIXME-UNCLEAN: these signal handlers can be set by (modern) versions of Glade */ 1155 /* FIXME-GTK3: these signal handlers can be set by (modern) versions of Glade */
1156 keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview); 1156 keywords_selection = gtk_tree_view_get_selection (ctx->keywords_treeview);
1157 g_signal_connect (G_OBJECT (keywords_selection), "changed", 1157 g_signal_connect (G_OBJECT (keywords_selection), "changed",
1158 G_CALLBACK (keywords_selection_changed_cb), ctx); 1158 G_CALLBACK (keywords_selection_changed_cb), ctx);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 14:38:00 +0000