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

[gnunet]

Author: grothoff
Date: 2012-02-02 19:53:02 +0100 (Thu, 02 Feb 2012)
New Revision: 19651

Modified:
   gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
   gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
Log:
-renaming signal handlers to follow naming conventions

Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2012-02-02 18:44:08 UTC 
(rev 19650)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade  2012-02-02 18:53:02 UTC 
(rev 19651)
@@ -350,9 +350,9 @@
                     <property name="events">GDK_ENTER_NOTIFY_MASK | 
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
                     <property name="use_action_appearance">False</property>
                     <property name="image_position">right</property>
-                    <signal name="toggled" 
handler="main_window_search_namespace_dropdown_button_toggled_cb" swapped="no"/>
-                    <signal name="leave-notify-event" 
handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/>
-                    <signal name="enter-notify-event" 
handler="main_window_search_namespace_dropdown_button_enter_notify_event_cb" 
swapped="no"/>
+                    <signal name="toggled" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb" 
swapped="no"/>
+                    <signal name="leave-notify-event" 
handler="GNUNET_FS_GTK_namespace_selector_window_leave_notify_event_cb" 
swapped="no"/>
+                    <signal name="enter-notify-event" 
handler="GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb" 
swapped="no"/>
                     <child>
                       <object class="GtkArrow" id="arrow1">
                         <property name="visible">True</property>
@@ -858,8 +858,8 @@
         <property name="hover_selection">True</property>
         <property name="hover_expand">True</property>
         <property name="tooltip_column">3</property>
-        <signal name="button-press-event" 
handler="namespace_selector_treeview_button_press_event_cb" swapped="no"/>
-        <signal name="button-release-event" 
handler="namespace_selector_treeview_button_release_event_cb" swapped="no"/>
+        <signal name="button-press-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb" 
swapped="no"/>
+        <signal name="button-release-event" 
handler="GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb" 
swapped="no"/>
         <child internal-child="selection">
           <object class="GtkTreeSelection" id="treeview-selection3"/>
         </child>

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-02-02 18:44:08 UTC (rev 19650)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-namespace-dropdown.c    
2012-02-02 18:53:02 UTC (rev 19651)
@@ -34,11 +34,12 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 void
-main_window_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
-                                                         togglebutton,
-                                                         gpointer user_data)
+GNUNET_FS_GTK_search_namespace_dropdown_button_toggled_cb (GtkToggleButton *
+                                                          togglebutton,
+                                                          gpointer user_data)
 {
   GtkBuilder *builder = GTK_BUILDER (user_data);
   gboolean active;
@@ -56,7 +57,12 @@
   {
     GtkAllocation togglebutton_allocation;
     GdkWindow *main_window_gdk;
-    gint mwg_x, mwg_y, tgb_x, tgb_y, popup_x, popup_y;
+    gint mwg_x;
+    gint mwg_y;
+    gint tgb_x;
+    gint tgb_y;
+    gint popup_x;
+    gint popup_y;
 
     gtk_widget_get_allocation (GTK_WIDGET (togglebutton),
                                &togglebutton_allocation);
@@ -89,14 +95,12 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 gboolean
-main_window_search_namespace_dropdown_button_enter_notify_event_cb (GtkWidget *
-                                                                    widget,
-                                                                    GdkEvent *
-                                                                    event,
-                                                                    gpointer
-                                                                    user_data)
+GNUNET_FS_GTK_search_namespace_dropdown_button_enter_notify_event_cb 
(GtkWidget *widget,
+                                                                     GdkEvent 
*event,
+                                                                     gpointer 
user_data)
 {
   if (namespace_selector_window_leave_timeout_source > 0)
     g_source_remove (namespace_selector_window_leave_timeout_source);
@@ -106,6 +110,7 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 static gboolean
 namespace_selector_window_leave_timeout_cb (gpointer user_data)
@@ -120,11 +125,12 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 gboolean
-namespace_selector_window_leave_notify_event_cb (GtkWidget * widget,
-                                                 GdkEvent * event,
-                                                 gpointer user_data)
+GNUNET_FS_GTK_namespace_selector_window_leave_notify_event_cb (GtkWidget * 
widget,
+                                                              GdkEvent * event,
+                                                              gpointer 
user_data)
 {
   GtkBuilder *builder;
   GtkToggleButton *toggle_button;
@@ -209,8 +215,9 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
-void
+static void
 namespace_selector_treeview_cursor_changed_cb (GtkWidget * widget,
                                                gpointer user_data)
 {
@@ -298,11 +305,12 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 gboolean
-namespace_selector_treeview_button_press_event_cb (GtkWidget * widget,
-                                                   GdkEvent * event,
-                                                   gpointer user_data)
+GNUNET_FS_GTK_namespace_selector_treeview_button_press_event_cb (GtkWidget * 
widget,
+                                                                GdkEvent * 
event,
+                                                                gpointer 
user_data)
 {
   GtkTreeRowReference *ref = NULL;
 
@@ -321,11 +329,12 @@
 
 /**
  *
+ * @param user_data the builder for the main window
  */
 gboolean
-namespace_selector_treeview_button_release_event_cb (GtkWidget * widget,
-                                                     GdkEvent * event,
-                                                     gpointer user_data)
+GNUNET_FS_GTK_namespace_selector_treeview_button_release_event_cb (GtkWidget * 
widget,
+                                                                  GdkEvent * 
event,
+                                                                  gpointer 
user_data)
 {
   GtkTreeRowReference *ref = NULL;
   gpointer old = g_object_get_data (G_OBJECT (widget), "pushed-rowreference");
@@ -437,6 +446,7 @@
  * @param widget the main window
  * @param user_data the builder for the main window
  */
+/* FIXME-STYLE: hang up on 'realize' event of a widget closer to home? */
 void
 GNUNET_GTK_main_window_realize_cb (GtkWidget * widget, gpointer user_data)
 {