[maemo-commits] [maemo-commits] r15458 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-04-17 19:12:11 +0300 (Thu, 17 Apr 2008)
New Revision: 15458

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
Log:
	Permissions are only changed when closing the dialog, not
	immediately when toggling the checkbox (N77409).

	* hildon-fm/hildon-file-details-dialog.c
	(hildon_file_details_dialog_read_only_toggled): Removed.
	(hildon_file_details_dialog_init): Don't connect it.
	(hildon_file_details_dialog_response): Call change_state here.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 15:59:46 UTC (rev 15457)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 16:12:11 UTC (rev 15458)
@@ -1,5 +1,13 @@
 2008-04-17  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	Permissions are only changed when closing the dialog, not
+	immediately when toggling the checkbox (N77409).
+
+	* hildon-fm/hildon-file-details-dialog.c
+	(hildon_file_details_dialog_read_only_toggled): Removed.
+	(hildon_file_details_dialog_init): Don't connect it.
+	(hildon_file_details_dialog_response): Call change_state here.
+
 	* hildon-fm/hildon-file-selection.c
 	(_hildon_file_selection_get_current_folder_path): Return the goal
 	uri if we have one (N83593).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 15:59:46 UTC (rev 15457)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 16:12:11 UTC (rev 15458)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.3~unreleased) unstable; urgency=low
 
-  * Fixes: NB#79697, NB#77225, NB#83593, NB#83955.
+  * Fixes: NB#79697, NB#77225, NB#83593, NB#83955, NB#77409.
   * Add "currently-dragging" property to HildonFileSelection. Related to
     NB#83827
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2008-04-17 15:59:46 UTC (rev 15457)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-details-dialog.c	2008-04-17 16:12:11 UTC (rev 15458)
@@ -209,7 +209,7 @@
 static void
 hildon_file_details_dialog_response(GtkDialog *dialog, gint response_id)
 {
-    if (response_id == GTK_RESPONSE_CANCEL)
+    if (response_id == GTK_RESPONSE_OK)
     {
       HildonFileDetailsDialog *self;
       gboolean state;
@@ -218,18 +218,11 @@
       state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->priv->file_readonly));
 
       if (state != self->priv->checkbox_original_state)
-        change_state(self, self->priv->checkbox_original_state);
+        change_state(self, state);
     }
 }
 
 static void
-hildon_file_details_dialog_read_only_toggled(GtkWidget *widget, gpointer data)
-{
-  change_state(HILDON_FILE_DETAILS_DIALOG(data),
-    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
-}
-
-static void
 hildon_file_details_dialog_map(GtkWidget *widget)
 {
   HildonFileDetailsDialogPrivate *priv;
@@ -481,10 +474,6 @@
     gtk_dialog_add_button(GTK_DIALOG(self),
                           _("sfil_bd_filetype_details_dialog_cancel"),
                           GTK_RESPONSE_CANCEL);
-
-    priv->toggle_handler = g_signal_connect(priv->file_readonly, "toggled",
-      G_CALLBACK(hildon_file_details_dialog_read_only_toggled),
-      self);
     
     gtk_widget_set_size_request (GTK_WIDGET (self), 400, -1);
 	g_signal_connect (G_OBJECT (self), "show",