Merge lp:~dobey/ubuntuone-client/fix-674876 into lp:ubuntuone-client/stable-1-4

[dobey]

Do a little error checking in _udf_created and simplify the code
Fix a few other compiler warnings

[Rick McBride (rmcbride)]

review: Approve

[Natalia Bidart (nataliabidart)]

I tested this branch, and though is not fixing the problem I reported about nautilus opening several windows, it works properly.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client/fix-674876 into lp:ubuntuone-client/stable-1-4 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.65
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.22
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-debug --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/stable-1-4 --with-sso=/var/cache/tarmac/ubuntu-sso-client/stable-1-0 ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objd...

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-10-18 10:13:00 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-12-08 15:14:53 +0000
@@ -1133,26 +1133,29 @@
   const gchar * path, * id;
   gboolean subscribed;
 
+  if (!success)
+      return;
+
   path = syncdaemon_folder_info_get_path (folder_info);
   id = syncdaemon_folder_info_get_volume_id (folder_info);
   subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
-  if (success) {
-    if (!g_hash_table_lookup (uon->udfs, path)) {
-      if (subscribed) {
-        GHashTableIter iter;
-	gchar *key;
-	NautilusFileInfo *file;
-
-	g_hash_table_insert (uon->udfs, g_strdup (path), g_strdup (id));
-
-	/* Update the emblems of the files on this new UDF */
-	g_hash_table_iter_init (&iter, uon->observed);
-	while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) file)) {
-  	  if (g_str_has_prefix (key, path))
-	    nautilus_file_info_add_emblem (file, "ubuntuone-updating");
-	}
+
+  if (!path || !id || !subscribed)
+      return;
+
+  if (!g_hash_table_lookup (uon->udfs, path)) {
+      GHashTableIter iter;
+      gchar *key;
+      NautilusFileInfo *file;
+
+      g_hash_table_insert (uon->udfs, g_strdup (path), g_strdup (id));
+
+      /* Update the emblems of the files on this new UDF */
+      g_hash_table_iter_init (&iter, uon->observed);
+      while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) file)) {
+          if (g_str_has_prefix (key, path))
+              nautilus_file_info_add_emblem (file, "ubuntuone-updating");
       }
-    }
   }
 }
 
@@ -1181,8 +1184,8 @@
     ubuntuone_nautilus_reset_emblem (uon, path);
 
     /* Now remove the files from the status hash tables */
-    g_hash_table_foreach_remove (uon->updated, (GHRFunc) remove_by_path_in_hash, path);
-    g_hash_table_foreach_remove (uon->needsupdating, (GHRFunc) remove_by_path_in_hash, path);
+    g_hash_table_foreach_remove (uon->updated, (GHRFunc) remove_by_path_in_hash, (gpointer) path);
+    g_hash_table_foreach_remove (uon->needsupdating, (GHRFunc) remove_by_path_in_hash, (gpointer) path);
   }
 }
 
@@ -1265,7 +1268,7 @@
 				  gpointer user_data)
 {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
-  gchar * path;
+  const gchar * path;
 
   path = syncdaemon_share_info_get_path (share_info);
   if (success) {