gvfs r1303 - in trunk: . daemon gconf test

[alexl svn gnome org]

Author: alexl
Date: Tue Feb 19 09:47:30 2008
New Revision: 1303
URL: http://svn.gnome.org/viewvc/gvfs?rev=1303&view=rev

Log:
2008-02-19  Alexander Larsson  <alexl redhat com>

        * daemon/gvfsbackendsftp.c:
        * daemon/gvfsbackendtrash.c:
        * gconf/gapplookupgconf.c:
        * test/benchmark-common.c:
	Some more cleanup.



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendsftp.c
   trunk/daemon/gvfsbackendtrash.c
   trunk/gconf/gapplookupgconf.c
   trunk/test/benchmark-common.c

Modified: trunk/daemon/gvfsbackendsftp.c
==============================================================================
--- trunk/daemon/gvfsbackendsftp.c	(original)
+++ trunk/daemon/gvfsbackendsftp.c	Tue Feb 19 09:47:30 2008
@@ -1004,7 +1004,6 @@
   GDataInputStream *reply;
   GFileInfo *info;
   int type;
-  guint32 id;
   
   command = new_command_stream (backend, SSH_FXP_STAT, NULL);
   put_string (command, ".");
@@ -1015,7 +1014,7 @@
     return FALSE;
   
   type = g_data_input_stream_read_byte (reply, NULL, NULL);
-  id = g_data_input_stream_read_uint32 (reply, NULL, NULL);
+  /*id =*/ (void) g_data_input_stream_read_uint32 (reply, NULL, NULL);
 
   /* On error, set uid to -1 and ignore */
   backend->my_uid = (guint32)-1;
@@ -2712,7 +2711,6 @@
                          gpointer user_data)
 {
   ReadDirData *data;
-  guint32 count;
   GFileInfo *info = user_data;
   char *target;
 
@@ -2720,7 +2718,8 @@
 
   if (reply_type == SSH_FXP_NAME)
     {
-      count = g_data_input_stream_read_uint32 (reply, NULL, NULL);
+      /* count = */ (void) g_data_input_stream_read_uint32 (reply, NULL, NULL);
+      
       target = read_string (reply, NULL);
       if (target)
         {

Modified: trunk/daemon/gvfsbackendtrash.c
==============================================================================
--- trunk/daemon/gvfsbackendtrash.c	(original)
+++ trunk/daemon/gvfsbackendtrash.c	Tue Feb 19 09:47:30 2008
@@ -201,8 +201,9 @@
     {
       char *trashname;
       trashname = g_strndup (escaped_dir + 1, len - 1);
-      return g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL);
+      dir = g_build_filename (g_get_user_data_dir (), "Trash", trashname, NULL);
       g_free (trashname);
+      return dir;
     }
   
   dir = g_malloc (len + 1 + 1);
@@ -553,7 +554,7 @@
 
       if (info & HAS_SYSTEM_DIR)
         {
-          basename = g_strdup_printf ("%d", getuid());
+          basename = g_strdup_printf ("%u", getuid());
           trashdir = g_build_filename (topdir, ".Trash", basename, NULL);
           g_free (basename);
           dirs = g_list_prepend (dirs, trashdir);
@@ -561,7 +562,7 @@
       
       if (info & HAS_USER_DIR)
         {
-          basename = g_strdup_printf (".Trash-%d", getuid());
+          basename = g_strdup_printf (".Trash-%u", getuid());
           trashdir = g_build_filename (topdir, basename, NULL);
           g_free (basename);
           dirs = g_list_prepend (dirs, trashdir);

Modified: trunk/gconf/gapplookupgconf.c
==============================================================================
--- trunk/gconf/gapplookupgconf.c	(original)
+++ trunk/gconf/gapplookupgconf.c	Tue Feb 19 09:47:30 2008
@@ -147,10 +147,10 @@
 
       if (enabled)
         {
-          if (g_str_has_suffix (command, "\"\%s\"") ||
-              g_str_has_suffix (command, "\'\%s\'"))
+          if (g_str_has_suffix (command, "\"%s\"") ||
+              g_str_has_suffix (command, "\'%s\'"))
             command[strlen (command) - 4] = 0;
-          else if (g_str_has_suffix (command, "\%s"))
+          else if (g_str_has_suffix (command, "%s"))
             command[strlen (command) - 2] = 0;
 
           flags = G_APP_INFO_CREATE_SUPPORTS_URIS;

Modified: trunk/test/benchmark-common.c
==============================================================================
--- trunk/test/benchmark-common.c	(original)
+++ trunk/test/benchmark-common.c	Tue Feb 19 09:47:30 2008
@@ -67,6 +67,7 @@
 GList    *benchmark_data_plots = NULL;
 gboolean  benchmark_is_running = FALSE;
 
+#if 0
 static void
 benchmark_begin_data_plot (const gchar *name, const gchar *x_unit, const gchar *y_unit)
 {
@@ -123,6 +124,8 @@
   g_array_append_val (data_set->points, data_point);
 }
 
+#endif
+
 static void
 benchmark_end (void)
 {