eog r4825 - in trunk: . data src

[friemann svn gnome org]

Author: friemann
Date: Sat Oct 18 12:18:28 2008
New Revision: 4825
URL: http://svn.gnome.org/viewvc/eog?rev=4825&view=rev

Log:
2008-10-18  Felix Riemann  <friemann svn gnome org>

	* data/eog-multiple-save-as-dialog.glade:
	* data/eog-multiple-save-as-dialog.ui:
	* src/eog-save-as-dialog-helper.c: (eog_save_as_dialog_new):
	Connect the two autoconnect handlers by hand. This is no work 
	here, brings the dialog in sync with the other GtkBuilder 
	generated dialogs and allows us to unexport the callbacks.


Modified:
   trunk/ChangeLog
   trunk/data/eog-multiple-save-as-dialog.glade
   trunk/data/eog-multiple-save-as-dialog.ui
   trunk/src/eog-save-as-dialog-helper.c

Modified: trunk/data/eog-multiple-save-as-dialog.glade
==============================================================================
--- trunk/data/eog-multiple-save-as-dialog.glade	(original)
+++ trunk/data/eog-multiple-save-as-dialog.glade	Sat Oct 18 12:18:28 2008
@@ -189,7 +189,6 @@
 			  <property name="has_frame">True</property>
 			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
-			  <signal name="changed" handler="on_token_entry_changed" last_modification_time="Sun, 11 Jul 2004 14:33:47 GMT"/>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
@@ -371,7 +370,6 @@
 			      <property name="snap_to_ticks">False</property>
 			      <property name="wrap">False</property>
 			      <property name="adjustment">1 0 10000000 1 10 0</property>
-			      <signal name="changed" handler="on_counter_spin_changed"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>

Modified: trunk/data/eog-multiple-save-as-dialog.ui
==============================================================================
--- trunk/data/eog-multiple-save-as-dialog.ui	(original)
+++ trunk/data/eog-multiple-save-as-dialog.ui	Sat Oct 18 12:18:28 2008
@@ -179,7 +179,6 @@
                             <property name="has_frame">True</property>
                             <property name="invisible_char">*</property>
                             <property name="activates_default">False</property>
-                            <signal handler="on_token_entry_changed" last_modification_time="Sun, 11 Jul 2004 14:33:47 GMT" name="changed"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -348,7 +347,6 @@
                                 <property name="snap_to_ticks">False</property>
                                 <property name="wrap">False</property>
                                 <property name="adjustment">adjustment1</property>
-                                <signal handler="on_counter_spin_changed" name="changed"/>
                               </object>
                               <packing>
                                 <property name="padding">0</property>

Modified: trunk/src/eog-save-as-dialog-helper.c
==============================================================================
--- trunk/src/eog-save-as-dialog-helper.c	(original)
+++ trunk/src/eog-save-as-dialog-helper.c	Sat Oct 18 12:18:28 2008
@@ -98,7 +98,7 @@
 	request_preview_update (GTK_WIDGET (data));
 }
 
-void
+static void
 on_token_entry_changed (GtkWidget *widget, gpointer user_data)
 {
 	SaveAsData *data;
@@ -120,7 +120,7 @@
 	request_preview_update (GTK_WIDGET (data));
 }
 
-void
+static void
 on_counter_spin_changed (GtkWidget *widget, gpointer data)
 {
 	request_preview_update (GTK_WIDGET (data));
@@ -251,10 +251,14 @@
 	g_signal_connect (G_OBJECT (data->format_combobox), "changed",
 			  (GCallback) on_format_combobox_changed, dlg);
 
+	g_signal_connect (G_OBJECT (data->token_entry), "changed",
+			  (GCallback) on_token_entry_changed, dlg);
+
 	g_signal_connect (G_OBJECT (data->replace_spaces_check), "toggled",
 			  (GCallback) on_replace_spaces_check_clicked, dlg);
 
-	gtk_builder_connect_signals (xml, dlg);
+	g_signal_connect (G_OBJECT (data->counter_spin), "changed",
+			  (GCallback) on_counter_spin_changed, dlg);
 
 	label = GTK_WIDGET (gtk_builder_get_object (xml, "preview_label_from"));
 	gtk_label_set_text (GTK_LABEL (label), eog_image_get_caption (data->image));