[Pkg-maemo-commits] r358 ./hildon-fm/debian: * Fixed some compilation errors and warnings.

[Jonny Lamb]

------------------------------------------------------------
revno: 358
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-fm
timestamp: Fri 2007-12-28 01:57:34 +0000
message:
  * Fixed some compilation errors and warnings.
modified:
  debian/changelog
  hildon-fm/hildon-file-chooser-dialog.c
  hildon-fm/hildon-file-system-settings.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-12-27 20:37:28 +0000
+++ b/debian/changelog	2007-12-28 01:57:34 +0000
@@ -19,8 +19,9 @@
   * Added myself to Uploaders.
   * Merged with trunk branch.
   * Updated debian/copyright.
+  * Fixed some compilation errors and warnings.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Thu, 27 Dec 2007 20:37:17 +0000
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Fri, 28 Dec 2007 01:56:36 +0000
 
 libhildonfm (1:1.9.49) unstable; urgency=low
 

=== modified file 'hildon-fm/hildon-file-chooser-dialog.c'
--- a/hildon-fm/hildon-file-chooser-dialog.c	2007-12-27 09:54:51 +0000
+++ b/hildon-fm/hildon-file-chooser-dialog.c	2007-12-28 01:57:34 +0000
@@ -1321,8 +1321,15 @@
 	/* Make OK button insensitive while folder operation is going */
 	gtk_dialog_set_response_sensitive (GTK_DIALOG(dialog), GTK_RESPONSE_OK, FALSE);
       }
-        hildon_file_chooser_dialog_set_current_folder
-	  (GTK_FILE_CHOOSER(self), file_path, NULL);
+    /* If user cancelled the operation, we still can have handle
+     */
+    if (self->priv->create_folder_handle)
+      gtk_file_system_cancel_operation (self->priv->create_folder_handle);
+
+    /* If we created a folder, change into it */
+    if (response == HILDON_RESPONSE_FOLDER_CREATED)
+      {
+        g_assert(file_path != NULL);
         if (!hildon_file_chooser_dialog_set_current_folder
           (GTK_FILE_CHOOSER(self), file_path, NULL) && uri) {
 			hildon_file_selection_move_cursor_to_uri (self->priv->filetree, 

=== modified file 'hildon-fm/hildon-file-system-settings.c'
--- a/hildon-fm/hildon-file-system-settings.c	2007-08-31 15:16:13 +0000
+++ b/hildon-fm/hildon-file-system-settings.c	2007-12-28 01:57:34 +0000
@@ -926,7 +926,7 @@
 hildon_file_system_write_user_settings (GKeyFile *keys)
 {
   GError *error = NULL;
-  gssize len;
+  gsize len;
   gchar *data = g_key_file_to_data (keys, &len, &error);
 
   if (error)