[maemo-commits] [maemo-commits] r11737 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-05-21 20:27:04 +0300 (Mon, 21 May 2007)
New Revision: 11737

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c (handle_folder_popup):
	Store the handle in the private structure of the sub-dialog, not
	in the main dialog, stupid (N53829).


Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-05-21 16:18:31 UTC (rev 11736)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-05-21 17:27:04 UTC (rev 11737)
@@ -1102,6 +1102,7 @@
 
     g_assert(HILDON_IS_FILE_CHOOSER_DIALOG(data));
     self = HILDON_FILE_CHOOSER_DIALOG(data);
+
     g_assert(self->priv->create_folder_handle == handle);
 
     self->priv->create_folder_handle = NULL;
@@ -1177,10 +1178,14 @@
 
       /* There shouldn't be a way to invoke two simultaneous folder
          creating actions */
-      g_assert(self->priv->create_folder_handle == NULL);
 
+      HildonFileChooserDialogPrivate *sub_priv =
+	HILDON_FILE_CHOOSER_DIALOG (dialog)->priv;
+
+      g_assert(sub_priv->create_folder_handle == NULL);
+
       /* Callback is quaranteed to be called, it unrefs the object data */
-      self->priv->create_folder_handle = 
+      sub_priv->create_folder_handle = 
 	gtk_file_system_create_folder (backend, file_path, 
 				       create_folder_callback,
 				       g_object_ref(dialog));
@@ -1787,6 +1792,7 @@
     self->priv = priv =
         G_TYPE_INSTANCE_GET_PRIVATE(self, HILDON_TYPE_FILE_CHOOSER_DIALOG,
                                     HildonFileChooserDialogPrivate);
+
     size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
     priv->filters = NULL;
     priv->autonaming_enabled = TRUE;