[gnac/devel] Used gtkbuilder to connect toggled signals



commit 4e6d814ec22f0c30066536eee161310aa5840b5b
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Mon Nov 7 22:49:44 2011 +0000

    Used gtkbuilder to connect toggled signals

 data/profiles/ui/gnac-profiles-aac.xml       |    1 +
 data/profiles/ui/gnac-profiles-speex.xml     |    2 ++
 data/profiles/ui/gnac-profiles-wavpack.xml   |    1 +
 src/profiles/formats/gnac-profiles-aac.c     |    5 +----
 src/profiles/formats/gnac-profiles-aac.h     |    3 +++
 src/profiles/formats/gnac-profiles-speex.c   |    7 +++----
 src/profiles/formats/gnac-profiles-speex.h   |    3 +++
 src/profiles/formats/gnac-profiles-wavpack.c |    5 +----
 src/profiles/formats/gnac-profiles-wavpack.h |    3 +++
 src/profiles/gnac-profiles-utils.c           |    1 -
 10 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/data/profiles/ui/gnac-profiles-aac.xml b/data/profiles/ui/gnac-profiles-aac.xml
index a67e92c..203b8c8 100755
--- a/data/profiles/ui/gnac-profiles-aac.xml
+++ b/data/profiles/ui/gnac-profiles-aac.xml
@@ -103,6 +103,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="gnac_profiles_aac_generate_pipeline"/>
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
diff --git a/data/profiles/ui/gnac-profiles-speex.xml b/data/profiles/ui/gnac-profiles-speex.xml
index 644929c..3bc3427 100644
--- a/data/profiles/ui/gnac-profiles-speex.xml
+++ b/data/profiles/ui/gnac-profiles-speex.xml
@@ -173,6 +173,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
+                        <signal handler="gnac_profiles_speex_generate_pipeline" name="toggled"/>
                       </object>
                       <packing>
                         <property name="right_attach">2</property>
@@ -420,6 +421,7 @@
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
             <property name="draw_indicator">True</property>
+            <signal name="toggled" handler="gnac_profiles_speex_generate_pipeline"/>
           </object>
           <packing>
             <property name="top_attach">4</property>
diff --git a/data/profiles/ui/gnac-profiles-wavpack.xml b/data/profiles/ui/gnac-profiles-wavpack.xml
index 765b13c..dbafa7d 100644
--- a/data/profiles/ui/gnac-profiles-wavpack.xml
+++ b/data/profiles/ui/gnac-profiles-wavpack.xml
@@ -152,6 +152,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="gnac_profiles_wavpack_generate_pipeline"/>
                       </object>
                       <packing>
                         <property name="top_attach">7</property>
diff --git a/src/profiles/formats/gnac-profiles-aac.c b/src/profiles/formats/gnac-profiles-aac.c
index 4b68342..05c4fb0 100755
--- a/src/profiles/formats/gnac-profiles-aac.c
+++ b/src/profiles/formats/gnac-profiles-aac.c
@@ -59,9 +59,6 @@ static UpdateTextBufferFunc update_text_buffer_call_back;
 static const gchar *
 gnac_profiles_aac_init(UpdateTextBufferFunc call_back);
 
-static void
-gnac_profiles_aac_generate_pipeline(void);
-
 static AudioProfileAAC *
 gnac_profiles_aac_generate_audio_profile(GError **error);
 
@@ -160,7 +157,7 @@ gnac_profiles_aac_init(UpdateTextBufferFunc call_back)
 }
 
 
-static void
+void
 gnac_profiles_aac_generate_pipeline(void)
 {
   gchar *pipeline;
diff --git a/src/profiles/formats/gnac-profiles-aac.h b/src/profiles/formats/gnac-profiles-aac.h
index d0677b0..4e451ae 100644
--- a/src/profiles/formats/gnac-profiles-aac.h
+++ b/src/profiles/formats/gnac-profiles-aac.h
@@ -33,6 +33,9 @@ G_BEGIN_DECLS
 FormatModuleFuncs
 gnac_profiles_aac_get_funcs(void);
 
+void
+gnac_profiles_aac_generate_pipeline(void);
+
 G_END_DECLS
 
 #endif /* GNAC_PROFILES_AAC_H */
diff --git a/src/profiles/formats/gnac-profiles-speex.c b/src/profiles/formats/gnac-profiles-speex.c
index 65c4949..056f02d 100644
--- a/src/profiles/formats/gnac-profiles-speex.c
+++ b/src/profiles/formats/gnac-profiles-speex.c
@@ -70,9 +70,6 @@ static UpdateTextBufferFunc update_text_buffer_call_back;
 static const gchar *
 gnac_profiles_speex_init(UpdateTextBufferFunc call_back);
 
-static void
-gnac_profiles_speex_generate_pipeline(void);
-
 static AudioProfileSpeex *
 gnac_profiles_speex_generate_audio_profile(GError **error);
 
@@ -315,7 +312,7 @@ gnac_profiles_speex_display_vad(BitrateMode bitrate_mode)
 }
 
 
-static void
+void
 gnac_profiles_speex_generate_pipeline(void)
 {
   gchar     *pipeline;
@@ -406,6 +403,8 @@ gnac_profiles_speex_vad_on_toggle(GtkToggleButton *togglebutton,
   } else {
     gtk_widget_hide(dtx);
   }
+
+  gnac_profiles_speex_generate_pipeline();
 }
 
 
diff --git a/src/profiles/formats/gnac-profiles-speex.h b/src/profiles/formats/gnac-profiles-speex.h
index ddd14d8..62f0fba 100644
--- a/src/profiles/formats/gnac-profiles-speex.h
+++ b/src/profiles/formats/gnac-profiles-speex.h
@@ -34,6 +34,9 @@ FormatModuleFuncs
 gnac_profiles_speex_get_funcs(void);
 
 void
+gnac_profiles_speex_generate_pipeline(void);
+
+void
 gnac_profiles_speex_advanced_on_toggle(GtkWidget       *widget,
                                        GtkToggleButton *togglebutton);
 
diff --git a/src/profiles/formats/gnac-profiles-wavpack.c b/src/profiles/formats/gnac-profiles-wavpack.c
index 37b5cc7..8a803de 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.c
+++ b/src/profiles/formats/gnac-profiles-wavpack.c
@@ -66,9 +66,6 @@ static UpdateTextBufferFunc update_text_buffer_call_back;
 static const gchar *
 gnac_profiles_wavpack_init(UpdateTextBufferFunc call_back);
 
-static void
-gnac_profiles_wavpack_generate_pipeline(void);
-
 static AudioProfileWavpack *
 gnac_profiles_wavpack_generate_audio_profile(GError **error);
 
@@ -251,7 +248,7 @@ gnac_profiles_wavpack_bitrate_control_on_changed(GtkComboBox *widget)
 }
 
 
-static void
+void
 gnac_profiles_wavpack_generate_pipeline(void)
 {
   GtkWidget *widget; 
diff --git a/src/profiles/formats/gnac-profiles-wavpack.h b/src/profiles/formats/gnac-profiles-wavpack.h
index cfa962e..798df5f 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.h
+++ b/src/profiles/formats/gnac-profiles-wavpack.h
@@ -34,6 +34,9 @@ FormatModuleFuncs
 gnac_profiles_wavpack_get_funcs(void);
 
 void
+gnac_profiles_wavpack_generate_pipeline(void);
+
+void
 gnac_profiles_wavpack_bitrate_control_on_toggle(GtkWidget       *widget,
                                                 GtkToggleButton *togglebutton);
 
diff --git a/src/profiles/gnac-profiles-utils.c b/src/profiles/gnac-profiles-utils.c
index 9156dc2..e55da0f 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -219,7 +219,6 @@ gnac_profiles_utils_register_check(GtkWidget   *widget,
   }
 
   g_object_set_data(G_OBJECT(widget), "check-values", check);
-  g_signal_connect(G_OBJECT(widget), "toggled", call_back, user_data);
 
   return result;
 }



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