GNOME.org
 

[dconf] remove trailing spaces

commit 1de558a1efc5074a336007c63fd2c473122a8103
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Oct 7 16:42:19 2009 -0400

    remove trailing spaces

 dconf/dconf-config.c         |    4 +-
 dconf/dconf-dbus.c           |   60 +++++++++++++++++++++---------------------
 service/dconf-dbus-service.c |   60 +++++++++++++++++++++---------------------
 writer/dconf-writer-file.c   |    8 +++---
 writer/dconf-writer-merge.c  |    4 +-
 writer/dconf-writer.c        |    2 +-
 6 files changed, 69 insertions(+), 69 deletions(-)
---
diff --git a/dconf/dconf-config.c b/dconf/dconf-config.c
index 3cbf258..4611620 100644
--- a/dconf/dconf-config.c
+++ b/dconf/dconf-config.c
@@ -34,7 +34,7 @@ dconf_config_parse_mount_decl (GSList **mounts,
   gchar **db_strings;
   DConfMount *mount;
   gint i;
- 
+
   if (argc != 2)
     {
       g_set_error (error, G_SHELL_ERROR, G_SHELL_ERROR_FAILED,
@@ -241,5 +241,5 @@ dconf_config_read (void)
   if (mounts == NULL)
     g_error ("failed: %s\n", error->message);
 
-  return mounts; 
+  return mounts;
 }
diff --git a/dconf/dconf-dbus.c b/dconf/dconf-dbus.c
index 1722c96..af84708 100644
--- a/dconf/dconf-dbus.c
+++ b/dconf/dconf-dbus.c
@@ -935,22 +935,22 @@ _g_dbus_oom (void)
  *             Helper fd source                                          *
  ************************************************************************/
 
-typedef struct 
+typedef struct
 {
   GSource source;
   GPollFD pollfd;
 } FDSource;
 
-static gboolean 
+static gboolean
 fd_source_prepare (GSource  *source,
 		   gint     *timeout)
 {
   *timeout = -1;
-  
+
   return FALSE;
 }
 
-static gboolean 
+static gboolean
 fd_source_check (GSource  *source)
 {
   FDSource *fd_source = (FDSource *)source;
@@ -1010,14 +1010,14 @@ static GOnce once_init_main_integration = G_ONCE_INIT;
  * A GSource subclass for dispatching DBusConnection messages.
  * We need this on top of the IO handlers, because sometimes
  * there are messages to dispatch queued up but no IO pending.
- * 
+ *
  * The source is owned by the connection (and the main context
  * while that is alive)
  */
-typedef struct 
+typedef struct
 {
   GSource source;
-  
+
   DBusConnection *connection;
   GSList *ios;
   GSList *timeouts;
@@ -1051,10 +1051,10 @@ dbus_source_prepare (GSource *source,
 		     gint    *timeout)
 {
   DBusConnection *connection = ((DBusSource *)source)->connection;
-  
+
   *timeout = -1;
 
-  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);  
+  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);
 }
 
 static gboolean
@@ -1074,7 +1074,7 @@ dbus_source_dispatch (GSource     *source,
 
   /* Only dispatch once - we don't want to starve other GSource */
   dbus_connection_dispatch (connection);
-  
+
   dbus_connection_unref (connection);
 
   return TRUE;
@@ -1090,10 +1090,10 @@ io_handler_dispatch (gpointer data,
   DBusConnection *connection;
 
   connection = handler->dbus_source->connection;
-  
+
   if (connection)
     dbus_connection_ref (connection);
-  
+
   if (condition & G_IO_IN)
     dbus_condition |= DBUS_WATCH_READABLE;
   if (condition & G_IO_OUT)
@@ -1112,7 +1112,7 @@ io_handler_dispatch (gpointer data,
 
   if (connection)
     dbus_connection_unref (connection);
-  
+
   return TRUE;
 }
 
@@ -1120,10 +1120,10 @@ static void
 io_handler_free (IOHandler *handler)
 {
   DBusSource *dbus_source;
-  
+
   dbus_source = handler->dbus_source;
   dbus_source->ios = g_slist_remove (dbus_source->ios, handler);
-  
+
   g_source_destroy (handler->source);
   g_source_unref (handler->source);
   g_free (handler);
@@ -1140,9 +1140,9 @@ dbus_source_add_watch (DBusSource *dbus_source,
 
   if (!dbus_watch_get_enabled (watch))
     return;
-  
+
   g_assert (dbus_watch_get_data (watch) == NULL);
-  
+
   flags = dbus_watch_get_flags (watch);
 
   condition = G_IO_ERR | G_IO_HUP;
@@ -1160,13 +1160,13 @@ dbus_source_add_watch (DBusSource *dbus_source,
 #else
   fd = dbus_watch_get_fd (watch);
 #endif
-    
+
   handler->source = __g_fd_source_new (fd, condition);
   g_source_set_callback (handler->source,
 			 (GSourceFunc) io_handler_dispatch, handler,
                          NULL);
   g_source_attach (handler->source, NULL);
- 
+
   dbus_source->ios = g_slist_prepend (dbus_source->ios, handler);
   dbus_watch_set_data (watch, handler,
 		       (DBusFreeFunction)io_handler_free);
@@ -1198,7 +1198,7 @@ timeout_handler_dispatch (gpointer      data)
   TimeoutHandler *handler = data;
 
   dbus_timeout_handle (handler->timeout);
-  
+
   return TRUE;
 }
 
@@ -1207,10 +1207,10 @@ dbus_source_add_timeout (DBusSource *dbus_source,
 			 DBusTimeout *timeout)
 {
   TimeoutHandler *handler;
-  
+
   if (!dbus_timeout_get_enabled (timeout))
     return;
-  
+
   g_assert (dbus_timeout_get_data (timeout) == NULL);
 
   handler = g_new0 (TimeoutHandler, 1);
@@ -1244,7 +1244,7 @@ add_watch (DBusWatch *watch,
   DBusSource *dbus_source = data;
 
   dbus_source_add_watch (dbus_source, watch);
-  
+
   return TRUE;
 }
 
@@ -1274,7 +1274,7 @@ add_timeout (DBusTimeout *timeout,
 	     void        *data)
 {
   DBusSource *source = data;
-  
+
   if (!dbus_timeout_get_enabled (timeout))
     return TRUE;
 
@@ -1324,14 +1324,14 @@ dbus_source_free (DBusSource *dbus_source)
   while (dbus_source->ios)
     {
       IOHandler *handler = dbus_source->ios->data;
-      
+
       dbus_watch_set_data (handler->watch, NULL, NULL);
     }
 
   while (dbus_source->timeouts)
     {
       TimeoutHandler *handler = dbus_source->timeouts->data;
-      
+
       dbus_timeout_set_data (handler->timeout, NULL, NULL);
     }
 
@@ -1358,7 +1358,7 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
   DBusSource *dbus_source;
 
   g_once (&once_init_main_integration, main_integration_init, NULL);
-  
+
   g_assert (connection != NULL);
 
   _g_dbus_connection_remove_from_main (connection);
@@ -1366,9 +1366,9 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
   dbus_source = (DBusSource *)
     g_source_new ((GSourceFuncs*)&dbus_source_funcs,
 		  sizeof (DBusSource));
-  
+
   dbus_source->connection = connection;
-  
+
   if (!dbus_connection_set_watch_functions (connection,
                                             add_watch,
                                             remove_watch,
@@ -1382,7 +1382,7 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
                                               timeout_toggled,
                                               dbus_source, NULL))
     _g_dbus_oom ();
-    
+
   dbus_connection_set_wakeup_main_function (connection,
 					    wakeup_main,
 					    dbus_source, NULL);
diff --git a/service/dconf-dbus-service.c b/service/dconf-dbus-service.c
index 2d8c33b..33a098d 100644
--- a/service/dconf-dbus-service.c
+++ b/service/dconf-dbus-service.c
@@ -835,22 +835,22 @@ _g_dbus_oom (void)
  *             Helper fd source                                          *
  ************************************************************************/
 
-typedef struct 
+typedef struct
 {
   GSource source;
   GPollFD pollfd;
 } FDSource;
 
-static gboolean 
+static gboolean
 fd_source_prepare (GSource  *source,
 		   gint     *timeout)
 {
   *timeout = -1;
-  
+
   return FALSE;
 }
 
-static gboolean 
+static gboolean
 fd_source_check (GSource  *source)
 {
   FDSource *fd_source = (FDSource *)source;
@@ -910,14 +910,14 @@ static GOnce once_init_main_integration = G_ONCE_INIT;
  * A GSource subclass for dispatching DBusConnection messages.
  * We need this on top of the IO handlers, because sometimes
  * there are messages to dispatch queued up but no IO pending.
- * 
+ *
  * The source is owned by the connection (and the main context
  * while that is alive)
  */
-typedef struct 
+typedef struct
 {
   GSource source;
-  
+
   DBusConnection *connection;
   GSList *ios;
   GSList *timeouts;
@@ -951,10 +951,10 @@ dbus_source_prepare (GSource *source,
 		     gint    *timeout)
 {
   DBusConnection *connection = ((DBusSource *)source)->connection;
-  
+
   *timeout = -1;
 
-  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);  
+  return (dbus_connection_get_dispatch_status (connection) == DBUS_DISPATCH_DATA_REMAINS);
 }
 
 static gboolean
@@ -974,7 +974,7 @@ dbus_source_dispatch (GSource     *source,
 
   /* Only dispatch once - we don't want to starve other GSource */
   dbus_connection_dispatch (connection);
-  
+
   dbus_connection_unref (connection);
 
   return TRUE;
@@ -990,10 +990,10 @@ io_handler_dispatch (gpointer data,
   DBusConnection *connection;
 
   connection = handler->dbus_source->connection;
-  
+
   if (connection)
     dbus_connection_ref (connection);
-  
+
   if (condition & G_IO_IN)
     dbus_condition |= DBUS_WATCH_READABLE;
   if (condition & G_IO_OUT)
@@ -1012,7 +1012,7 @@ io_handler_dispatch (gpointer data,
 
   if (connection)
     dbus_connection_unref (connection);
-  
+
   return TRUE;
 }
 
@@ -1020,10 +1020,10 @@ static void
 io_handler_free (IOHandler *handler)
 {
   DBusSource *dbus_source;
-  
+
   dbus_source = handler->dbus_source;
   dbus_source->ios = g_slist_remove (dbus_source->ios, handler);
-  
+
   g_source_destroy (handler->source);
   g_source_unref (handler->source);
   g_free (handler);
@@ -1040,9 +1040,9 @@ dbus_source_add_watch (DBusSource *dbus_source,
 
   if (!dbus_watch_get_enabled (watch))
     return;
-  
+
   g_assert (dbus_watch_get_data (watch) == NULL);
-  
+
   flags = dbus_watch_get_flags (watch);
 
   condition = G_IO_ERR | G_IO_HUP;
@@ -1060,13 +1060,13 @@ dbus_source_add_watch (DBusSource *dbus_source,
 #else
   fd = dbus_watch_get_fd (watch);
 #endif
-    
+
   handler->source = __g_fd_source_new (fd, condition);
   g_source_set_callback (handler->source,
 			 (GSourceFunc) io_handler_dispatch, handler,
                          NULL);
   g_source_attach (handler->source, NULL);
- 
+
   dbus_source->ios = g_slist_prepend (dbus_source->ios, handler);
   dbus_watch_set_data (watch, handler,
 		       (DBusFreeFunction)io_handler_free);
@@ -1098,7 +1098,7 @@ timeout_handler_dispatch (gpointer      data)
   TimeoutHandler *handler = data;
 
   dbus_timeout_handle (handler->timeout);
-  
+
   return TRUE;
 }
 
@@ -1107,10 +1107,10 @@ dbus_source_add_timeout (DBusSource *dbus_source,
 			 DBusTimeout *timeout)
 {
   TimeoutHandler *handler;
-  
+
   if (!dbus_timeout_get_enabled (timeout))
     return;
-  
+
   g_assert (dbus_timeout_get_data (timeout) == NULL);
 
   handler = g_new0 (TimeoutHandler, 1);
@@ -1144,7 +1144,7 @@ add_watch (DBusWatch *watch,
   DBusSource *dbus_source = data;
 
   dbus_source_add_watch (dbus_source, watch);
-  
+
   return TRUE;
 }
 
@@ -1174,7 +1174,7 @@ add_timeout (DBusTimeout *timeout,
 	     void        *data)
 {
   DBusSource *source = data;
-  
+
   if (!dbus_timeout_get_enabled (timeout))
     return TRUE;
 
@@ -1224,14 +1224,14 @@ dbus_source_free (DBusSource *dbus_source)
   while (dbus_source->ios)
     {
       IOHandler *handler = dbus_source->ios->data;
-      
+
       dbus_watch_set_data (handler->watch, NULL, NULL);
     }
 
   while (dbus_source->timeouts)
     {
       TimeoutHandler *handler = dbus_source->timeouts->data;
-      
+
       dbus_timeout_set_data (handler->timeout, NULL, NULL);
     }
 
@@ -1258,7 +1258,7 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
   DBusSource *dbus_source;
 
   g_once (&once_init_main_integration, main_integration_init, NULL);
-  
+
   g_assert (connection != NULL);
 
   _g_dbus_connection_remove_from_main (connection);
@@ -1266,9 +1266,9 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
   dbus_source = (DBusSource *)
     g_source_new ((GSourceFuncs*)&dbus_source_funcs,
 		  sizeof (DBusSource));
-  
+
   dbus_source->connection = connection;
-  
+
   if (!dbus_connection_set_watch_functions (connection,
                                             add_watch,
                                             remove_watch,
@@ -1282,7 +1282,7 @@ _g_dbus_connection_integrate_with_main (DBusConnection *connection)
                                               timeout_toggled,
                                               dbus_source, NULL))
     _g_dbus_oom ();
-    
+
   dbus_connection_set_wakeup_main_function (connection,
 					    wakeup_main,
 					    dbus_source, NULL);
diff --git a/writer/dconf-writer-file.c b/writer/dconf-writer-file.c
index 4e16834..4fdd44a 100644
--- a/writer/dconf-writer-file.c
+++ b/writer/dconf-writer-file.c
@@ -92,7 +92,7 @@ dconf_writer_create_temp_file (const gchar  *filename,
                    g_file_error_from_errno (saved_errno),
                    "failed to allocate %d bytes for temporary file %s: %s",
                    bytes, *tmpname, g_strerror (saved_errno));
-      unlink (*tmpname); 
+      unlink (*tmpname);
       g_free (*tmpname);
       close (*fd);
 
@@ -108,7 +108,7 @@ dconf_writer_create_temp_file (const gchar  *filename,
                    g_file_error_from_errno (saved_errno),
                    "failed to memory-map temporary file %s: %s",
                    *tmpname, g_strerror (saved_errno));
-      unlink (*tmpname); 
+      unlink (*tmpname);
       g_free (*tmpname);
       close (*fd);
 
@@ -246,7 +246,7 @@ dconf_writer_open (DConfWriter  *writer,
           *missing = TRUE;
           return TRUE;
         }
- 
+
       g_set_error (error, G_FILE_ERROR,
                    g_file_error_from_errno (saved_errno),
                    "failed to open existing dconf database %s: %s",
@@ -258,7 +258,7 @@ dconf_writer_open (DConfWriter  *writer,
   if (fstat (writer->fd, &buf))
     {
       gint saved_errno = errno;
- 
+
       g_set_error (error, G_FILE_ERROR,
                    g_file_error_from_errno (saved_errno),
                    "failed to fstat existing dconf database %s: %s",
diff --git a/writer/dconf-writer-merge.c b/writer/dconf-writer-merge.c
index 224a704..07e7cb4 100644
--- a/writer/dconf-writer-merge.c
+++ b/writer/dconf-writer-merge.c
@@ -252,7 +252,7 @@ merge_state_get_new_type (MergeState *state)
 {
   if (state->name == NULL)
     merge_state_setup_new_name (state);
-  
+
   if (state->name_is_dir)
     return '/';
 
@@ -721,7 +721,7 @@ dconf_writer_check_merge (const gchar  *prefix,
       for (i = 0; i < n_names; i++)
         {
           gint j;
-          
+
           if (names[i][0] == '\0')
             {
               g_set_error (error, 0, 0,
diff --git a/writer/dconf-writer.c b/writer/dconf-writer.c
index 72dc789..e8d1848 100644
--- a/writer/dconf-writer.c
+++ b/writer/dconf-writer.c
@@ -38,7 +38,7 @@ dconf_writer_allocate (DConfWriter *writer,
                        gsize        size,
                        guint32     *index)
 {
-  struct chunk_header *chunk = (gpointer) (writer->data.blocks + 
+  struct chunk_header *chunk = (gpointer) (writer->data.blocks +
                                            writer->data.super->next);
 
   if (!dconf_writer_in_bounds (writer, chunk, &chunk->contents[size]))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]