gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r19668 - in gnunet-gtk: contrib src/fs


From: gnunet
Subject: [GNUnet-SVN] r19668 - in gnunet-gtk: contrib src/fs
Date: Fri, 3 Feb 2012 13:36:41 +0100

Author: grothoff
Date: 2012-02-03 13:36:41 +0100 (Fri, 03 Feb 2012)
New Revision: 19668

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
   gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
   gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
Log:
-gladifying more signal handlers

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade     
2012-02-03 12:32:22 UTC (rev 19667)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade     
2012-02-03 12:36:41 UTC (rev 19668)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
@@ -19,7 +19,6 @@
   </object>
   <object class="GtkFileFilter" id="gnunet_directory_filter"/>
   <object class="GtkFileChooserDialog" 
id="GNUNET_GTK_publish_directory_dialog">
-    <property name="can_focus">False</property>
     <property name="can_default">True</property>
     <property name="events">GDK_FOCUS_CHANGE_MASK | 
GDK_STRUCTURE_MASK</property>
     <property name="border_width">5</property>
@@ -35,65 +34,20 @@
     <property name="create_folders">False</property>
     <property name="filter">gnunet_directory_filter</property>
     <property name="select_multiple">True</property>
+    <signal name="response" 
handler="GNUNET_GTK_publish_directory_dialog_response_cb"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox8">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area9">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_directory_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="n_rows">2</property>
             <property name="n_columns">4</property>
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_priority_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Priority:</property>
               </object>
               <packing>
@@ -107,10 +61,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
+                <property name="invisible_char">&#x2022;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">priority_adjustment</property>
@@ -125,7 +77,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Expiration 
year:</property>
               </object>
               <packing>
@@ -137,10 +88,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
+                <property name="invisible_char">&#x2022;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property 
name="adjustment">expiration_year_adjustment</property>
@@ -154,7 +103,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Anonymity:</property>
               </object>
               <packing>
@@ -167,7 +115,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_directory_dialog_replication_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" 
translatable="yes">_Replication:</property>
                 <property name="use_underline">True</property>
               </object>
@@ -184,10 +131,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
+                <property name="invisible_char">&#x25CF;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">replication_adjustment</property>
@@ -204,12 +149,10 @@
             <child>
               <object class="GtkAlignment" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkComboBox" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="active">1</property>
                     <child>
                       <object class="GtkCellRendererText" 
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
@@ -245,14 +188,12 @@
         <child>
           <object class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <child>
               <placeholder/>
             </child>
             <child>
               <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
                 <property name="label" translatable="yes">Index 
files</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -262,7 +203,6 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -273,6 +213,46 @@
             <property name="position">3</property>
           </packing>
         </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area9">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_directory_dialog_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade  2012-02-03 
12:32:22 UTC (rev 19667)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade  2012-02-03 
12:36:41 UTC (rev 19668)
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
   <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
-    <property name="can_focus">False</property>
     <property name="can_default">True</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Publish file...</property>
@@ -12,93 +11,15 @@
     <property name="type_hint">normal</property>
     <property name="create_folders">False</property>
     <property name="select_multiple">True</property>
+    <signal name="response" 
handler="GNUNET_GTK_publish_file_dialog_response_cb"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
-          <object class="GtkHBox" id="hbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_file_dialog_do_index_checkbutton">
-                <property name="label" translatable="yes">Index file</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">20</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="n_rows">2</property>
             <property name="n_columns">4</property>
             <property name="column_spacing">4</property>
@@ -106,12 +27,10 @@
             <child>
               <object class="GtkAlignment" 
id="GNUNET_GTK_publish_file_dialog_anonymity_combobox_alignment">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkComboBox" 
id="GNUNET_GTK_publish_file_dialog_anonymity_combobox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="active">1</property>
                     <child>
                       <object class="GtkCellRendererText" 
id="GNUNET_GTK_publish_file_dialog_anonymity_combobox_renderer"/>
@@ -139,7 +58,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_anonymity_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Anonymity:</property>
               </object>
               <packing>
@@ -154,7 +72,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_priority_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Priority:</property>
               </object>
               <packing>
@@ -168,10 +85,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_priority_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
+                <property name="invisible_char">&#x2022;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">priority_adjustment</property>
@@ -185,7 +100,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_expiration_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Expiration 
year:</property>
               </object>
               <packing>
@@ -197,10 +111,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_expiration_year_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
+                <property name="invisible_char">&#x2022;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property 
name="adjustment">expiration_year_adjustment</property>
@@ -214,7 +126,6 @@
             <child>
               <object class="GtkLabel" 
id="GNUNET_GTK_publish_file_dialog_replication_label">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="label" 
translatable="yes">_Replication:</property>
                 <property name="use_underline">True</property>
               </object>
@@ -229,10 +140,8 @@
               <object class="GtkSpinButton" 
id="GNUNET_GTK_publish_file_dialog_replication_spin_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">●</property>
+                <property name="invisible_char">&#x25CF;</property>
                 <property name="invisible_char_set">True</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">replication_adjustment</property>
@@ -253,6 +162,78 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHBox" id="hbox1">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkCheckButton" 
id="GNUNET_GTK_publish_file_dialog_do_index_checkbutton">
+                <property name="label" translatable="yes">Index file</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">20</property>
+                <property name="pack_type">end</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_cancel_button">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" 
id="GNUNET_GTK_publish_file_dialog_ok_button">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
       </object>
     </child>
     <action-widgets>
@@ -269,8 +250,8 @@
     </columns>
   </object>
   <object class="GtkAdjustment" id="anonymity_adjustment">
-    <property name="upper">10000000</property>
     <property name="value">1</property>
+    <property name="upper">10000000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -280,8 +261,8 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="priority_adjustment">
-    <property name="upper">100000000</property>
     <property name="value">1000</property>
+    <property name="upper">100000000</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2012-02-03 12:32:22 UTC 
(rev 19667)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_publish-dialog.c    2012-02-03 12:36:41 UTC 
(rev 19668)
@@ -1215,10 +1215,10 @@
  * @param response_id result of the dialog ("-5" means to "run")
  * @param user_data master publishing dialog context of our window
  */
-static void
-publish_directory_dialog_response_cb (GtkDialog * dialog,
-                                     gint response_id,
-                                     gpointer user_data)
+void
+GNUNET_GTK_publish_directory_dialog_response_cb (GtkDialog * dialog,
+                                                gint response_id,
+                                                gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
@@ -1276,10 +1276,10 @@
  * @param response_id result of the dialog ("-5" means to "run")
  * @param user_data master publishing dialog context of our window
  */
-static void
-publish_file_dialog_response_cb (GtkDialog * dialog,
-                                gint response_id,
-                                gpointer user_data)
+void
+GNUNET_GTK_publish_file_dialog_response_cb (GtkDialog * dialog,
+                                           gint response_id,
+                                           gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
 
@@ -1344,13 +1344,9 @@
                                                          gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
-  GtkComboBox *combo;
 
   ctx->open_file_builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_file_dialog.glade", ctx);
   GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_file_builder);
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
 
   /* FIXME-FEATURE: Use some kind of adjustable defaults instead of 1000, 0 
and TRUE */
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object 
(ctx->open_file_builder,
@@ -1360,17 +1356,24 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object 
(ctx->open_file_builder,
                                                                           
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")), TRUE);
 
-  /* FIXME-STYLE: automatically connect using glade  instead */
-  g_signal_connect (G_OBJECT (ad), "response",
-                   G_CALLBACK (publish_file_dialog_response_cb), ctx);
-  combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_file_builder,
-                                                
"GNUNET_GTK_publish_file_dialog_anonymity_combobox"));
-  gtk_combo_box_set_model (combo, 
-                          GNUNET_FS_GTK_get_anonymity_level_list_store ());
-  
+  {
+    GtkComboBox *combo;
+    
+    combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_file_builder,
+                                                  
"GNUNET_GTK_publish_file_dialog_anonymity_combobox"));
+    gtk_combo_box_set_model (combo, 
+                            GNUNET_FS_GTK_get_anonymity_level_list_store ());
+  }
+
   /* show dialog */
-  gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
-  gtk_window_present (GTK_WINDOW (ad));
+  {
+    GtkWidget *ad;
+
+    ad = GTK_WIDGET (gtk_builder_get_object
+                    (ctx->open_file_builder, 
"GNUNET_GTK_publish_file_dialog"));
+    gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
+    gtk_window_present (GTK_WINDOW (ad));
+  }
 }
 
 
@@ -1388,8 +1391,6 @@
                                                          gpointer user_data)
 {
   struct MainPublishingDialogContext *ctx = user_data;
-  GtkWidget *ad;
-  GtkComboBox *combo;
 
   ctx->open_directory_builder = GNUNET_GTK_get_new_builder 
("gnunet_fs_gtk_publish_directory_dialog.glade", ctx);
   GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_directory_builder);
@@ -1402,19 +1403,23 @@
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object 
(ctx->open_directory_builder,
                                                                           
"GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")), TRUE);
 
-  ad = GTK_WIDGET (gtk_builder_get_object
-                   (ctx->open_directory_builder, 
"GNUNET_GTK_publish_directory_dialog"));
+  {
+    GtkComboBox *combo;
 
-  /* FIXME-STYLE: automatically connect using glade  instead */
-  g_signal_connect (G_OBJECT (ad), "response",
-                   G_CALLBACK (publish_directory_dialog_response_cb), ctx);
-  combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_directory_builder,
-                                                
"GNUNET_GTK_publish_directory_dialog_anonymity_combobox"));
-  gtk_combo_box_set_model (combo, GNUNET_FS_GTK_get_anonymity_level_list_store 
());
+    combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_directory_builder,
+                                                  
"GNUNET_GTK_publish_directory_dialog_anonymity_combobox"));
+    gtk_combo_box_set_model (combo, 
GNUNET_FS_GTK_get_anonymity_level_list_store ());
+  }
 
   /* show dialog */
-  gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
-  gtk_window_present (GTK_WINDOW (ad));
+  {
+    GtkWidget *ad;
+
+    ad = GTK_WIDGET (gtk_builder_get_object
+                    (ctx->open_directory_builder, 
"GNUNET_GTK_publish_directory_dialog"));
+    gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
+    gtk_window_present (GTK_WINDOW (ad));
+  }
 }
 
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]