GNOME.org
 

[gnac/devel] Used gtkbuilder to connect changed signals

commit ac796ae4d2c09a44bf0610be4340c2c3a4d04da5
Author: BenoÃt Dupasquier <bdupasqu src gnome org>
Date:   Tue Nov 15 14:40:06 2011 +0000

    Used gtkbuilder to connect changed signals

 data/profiles/ui/gnac-profiles-aac.xml       |    3 +++
 data/profiles/ui/gnac-profiles-lame.xml      |    6 ++++++
 data/profiles/ui/gnac-profiles-speex.xml     |    2 ++
 data/profiles/ui/gnac-profiles-vorbis.xml    |    4 ++++
 data/profiles/ui/gnac-profiles-wavpack.xml   |    3 +++
 src/profiles/formats/gnac-profiles-lame.c    |    7 ++-----
 src/profiles/formats/gnac-profiles-lame.h    |    7 +++++++
 src/profiles/formats/gnac-profiles-vorbis.c  |    7 ++-----
 src/profiles/formats/gnac-profiles-vorbis.h  |    7 +++++++
 src/profiles/formats/gnac-profiles-wavpack.c |    2 +-
 src/profiles/formats/gnac-profiles-wavpack.h |    4 ++++
 src/profiles/gnac-profiles-utils.c           |    5 ++++-
 12 files changed, 45 insertions(+), 12 deletions(-)
---
diff --git a/data/profiles/ui/gnac-profiles-aac.xml b/data/profiles/ui/gnac-profiles-aac.xml
index 203b8c8..d28a437 100755
--- a/data/profiles/ui/gnac-profiles-aac.xml
+++ b/data/profiles/ui/gnac-profiles-aac.xml
@@ -44,6 +44,7 @@
                         <child>
                           <object class="GtkComboBoxText" id="combo-outputformat">
                             <property name="visible">True</property>
+                            <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -79,6 +80,7 @@
                         <child>
                           <object class="GtkComboBoxText" id="combo-profile">
                             <property name="visible">True</property>
+                            <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -143,6 +145,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-bitrate">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_aac_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/profiles/ui/gnac-profiles-lame.xml b/data/profiles/ui/gnac-profiles-lame.xml
index 9867cb5..48a84a5 100755
--- a/data/profiles/ui/gnac-profiles-lame.xml
+++ b/data/profiles/ui/gnac-profiles-lame.xml
@@ -44,6 +44,7 @@
                         <child>
                           <object class="GtkComboBoxText" id="combo-mode">
                             <property name="visible">True</property>
+                            <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -144,6 +145,7 @@
                           <object class="GtkComboBoxText" id="combo-min-vbr">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
+                            <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -167,6 +169,7 @@
                           <object class="GtkComboBoxText" id="combo-max-vbr">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
+                            <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -213,6 +216,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-encoding-mode">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_lame_on_encoding_mode_changed"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -233,6 +237,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-bitrate">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -256,6 +261,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-preset">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_lame_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/profiles/ui/gnac-profiles-speex.xml b/data/profiles/ui/gnac-profiles-speex.xml
index 3bc3427..f1a2b27 100644
--- a/data/profiles/ui/gnac-profiles-speex.xml
+++ b/data/profiles/ui/gnac-profiles-speex.xml
@@ -36,6 +36,7 @@
                         <child>
                           <object class="GtkComboBoxText" id="combo-mode">
                             <property name="visible">True</property>
+                            <signal name="changed" handler="gnac_profiles_speex_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -230,6 +231,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-bitrate-mode">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_speex_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/profiles/ui/gnac-profiles-vorbis.xml b/data/profiles/ui/gnac-profiles-vorbis.xml
index 974878f..0f055ac 100755
--- a/data/profiles/ui/gnac-profiles-vorbis.xml
+++ b/data/profiles/ui/gnac-profiles-vorbis.xml
@@ -65,6 +65,7 @@
                           <object class="GtkComboBoxText" id="combo-min-vbr">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
+                            <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -88,6 +89,7 @@
                           <object class="GtkComboBoxText" id="combo-max-vbr">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
+                            <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -134,6 +136,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-encoding-mode">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_vorbis_on_encoding_mode_changed"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -154,6 +157,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-bitrate">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_vorbis_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/data/profiles/ui/gnac-profiles-wavpack.xml b/data/profiles/ui/gnac-profiles-wavpack.xml
index dbafa7d..60ff334 100644
--- a/data/profiles/ui/gnac-profiles-wavpack.xml
+++ b/data/profiles/ui/gnac-profiles-wavpack.xml
@@ -84,6 +84,7 @@
                           <object class="GtkComboBoxText" id="combo-joint-stereo-mode">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
+                            <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -167,6 +168,7 @@
                         <child>
                           <object class="GtkComboBoxText" id="combo-bitrate-control">
                             <property name="visible">True</property>
+                            <signal name="changed" handler="gnac_profiles_wavpack_on_bitrate_control_changed"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -284,6 +286,7 @@
             <child>
               <object class="GtkComboBoxText" id="combo-mode">
                 <property name="visible">True</property>
+                <signal name="changed" handler="gnac_profiles_wavpack_generate_pipeline"/>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/src/profiles/formats/gnac-profiles-lame.c b/src/profiles/formats/gnac-profiles-lame.c
index d07a1cf..4c9ff8f 100755
--- a/src/profiles/formats/gnac-profiles-lame.c
+++ b/src/profiles/formats/gnac-profiles-lame.c
@@ -73,9 +73,6 @@ static UpdateTextBufferFunc update_text_buffer_call_back;
 static const gchar *
 gnac_profiles_lame_init(UpdateTextBufferFunc call_back);
 
-static void
-gnac_profiles_lame_generate_pipeline(void);
-
 static AudioProfileLame *
 gnac_profiles_lame_generate_audio_profile(GError **error);
 
@@ -137,7 +134,7 @@ gnac_profiles_lame_get_funcs(void)
 }
 
 
-static void
+void
 gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget,
                                             gpointer     user_data)
 {
@@ -324,7 +321,7 @@ gnac_profiles_lame_vbr_on_changed(GtkComboBox *widget)
 }
 
 
-static void
+void
 gnac_profiles_lame_generate_pipeline(void)
 {
   EncodingMode  encoding_mode;
diff --git a/src/profiles/formats/gnac-profiles-lame.h b/src/profiles/formats/gnac-profiles-lame.h
index a885d85..7ee32c1 100644
--- a/src/profiles/formats/gnac-profiles-lame.h
+++ b/src/profiles/formats/gnac-profiles-lame.h
@@ -34,6 +34,13 @@ FormatModuleFuncs
 gnac_profiles_lame_get_funcs(void);
 
 void
+gnac_profiles_lame_generate_pipeline(void);
+
+void
+gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget,
+                                            gpointer     user_data);
+
+void
 gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget       *widget,
                                               GtkToggleButton *togglebutton);
 
diff --git a/src/profiles/formats/gnac-profiles-vorbis.c b/src/profiles/formats/gnac-profiles-vorbis.c
index 7d04990..2b968ee 100755
--- a/src/profiles/formats/gnac-profiles-vorbis.c
+++ b/src/profiles/formats/gnac-profiles-vorbis.c
@@ -64,9 +64,6 @@ static UpdateTextBufferFunc update_text_buffer_call_back;
 static const gchar *
 gnac_profiles_vorbis_init(UpdateTextBufferFunc call_back);
 
-static void
-gnac_profiles_vorbis_generate_pipeline(void);
-
 static AudioProfileVorbis *
 gnac_profiles_vorbis_generate_audio_profile(GError **error);
 
@@ -128,7 +125,7 @@ gnac_profiles_vorbis_get_funcs(void)
 }
 
 
-static void
+void
 gnac_profiles_vorbis_on_encoding_mode_changed(GtkComboBox *widget,
                                               gpointer     user_data)
 {
@@ -228,7 +225,7 @@ gnac_profiles_vorbis_vbr_on_changed(GtkComboBox *widget)
 }
 
 
-static void
+void
 gnac_profiles_vorbis_generate_pipeline(void)
 {
   GtkWidget *widget; 
diff --git a/src/profiles/formats/gnac-profiles-vorbis.h b/src/profiles/formats/gnac-profiles-vorbis.h
index 445c4ca..f183580 100644
--- a/src/profiles/formats/gnac-profiles-vorbis.h
+++ b/src/profiles/formats/gnac-profiles-vorbis.h
@@ -34,9 +34,16 @@ FormatModuleFuncs
 gnac_profiles_vorbis_get_funcs(void);
 
 void
+gnac_profiles_vorbis_generate_pipeline(void);
+
+void
 gnac_profiles_vorbis_advanced_bitrate_on_toggle(GtkWidget       *widget,
                                                 GtkToggleButton *togglebutton);
 
+void
+gnac_profiles_vorbis_on_encoding_mode_changed(GtkComboBox *widget,
+                                              gpointer     user_data);
+
 G_END_DECLS
 
 #endif /* GNAC_PROFILES_VORBIS_H */
diff --git a/src/profiles/formats/gnac-profiles-wavpack.c b/src/profiles/formats/gnac-profiles-wavpack.c
index 8a803de..7e1b6a1 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.c
+++ b/src/profiles/formats/gnac-profiles-wavpack.c
@@ -127,7 +127,7 @@ gnac_profiles_wavpack_get_funcs(void)
 }
 
 
-static void
+void
 gnac_profiles_wavpack_on_bitrate_control_changed(GtkComboBox *widget,
                                                  gpointer     user_data)
 {
diff --git a/src/profiles/formats/gnac-profiles-wavpack.h b/src/profiles/formats/gnac-profiles-wavpack.h
index 798df5f..1cc7b8e 100644
--- a/src/profiles/formats/gnac-profiles-wavpack.h
+++ b/src/profiles/formats/gnac-profiles-wavpack.h
@@ -37,6 +37,10 @@ void
 gnac_profiles_wavpack_generate_pipeline(void);
 
 void
+gnac_profiles_wavpack_on_bitrate_control_changed(GtkComboBox *widget,
+                                                 gpointer     user_data);
+
+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 e55da0f..b88d504 100755
--- a/src/profiles/gnac-profiles-utils.c
+++ b/src/profiles/gnac-profiles-utils.c
@@ -165,7 +165,6 @@ gnac_profiles_utils_register_combo(GtkWidget   *widget,
 
   gnac_profiles_utils_add_values_combo(widget, combo);
   g_object_set_data(G_OBJECT(widget), "combo-values", combo);
-  g_signal_connect(G_OBJECT(widget), "changed", call_back, user_data);
 
   return result;
 }
@@ -774,6 +773,7 @@ gnac_profiles_utils_add_property_combo(gchar     *pipeline,
 
   index = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
   values = g_object_get_data(G_OBJECT(combo), "combo-values");
+  if (!values) return pipeline;
   value = g_list_nth_data(values->values, index);
   temp = g_strconcat(pipeline, " ", values->variable_name, "=", value, NULL);
 
@@ -851,6 +851,7 @@ gnac_profiles_utils_add_property_slider(gchar       *pipeline,
   
   value = gtk_range_get_value(GTK_RANGE(slider));
   values = g_object_get_data(G_OBJECT(slider), "slider-values");
+  if (!values) return pipeline;
   value_str = gnac_profiles_utils_gdouble_to_gchararray_format(value*factor,
       format);
   temp = g_strconcat(pipeline, " ", values->variable_name, "=", value_str, NULL);
@@ -989,6 +990,8 @@ gnac_profiles_utils_add_property_check(gchar     *pipeline,
   
   checked = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check));
   values = g_object_get_data(G_OBJECT(check), "check-values");
+  if (!values) return pipeline;
+
   temp = g_strconcat(pipeline, " ", values->variable_name, "=",
       checked ? "true" : "false", NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]