cheese r926 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Sat Aug 16 21:31:08 2008
New Revision: 926
URL: http://svn.gnome.org/viewvc/cheese?rev=926&view=rev

Log:
small syntax cleanup and removing of an unneeded variable


Modified:
   trunk/ChangeLog
   trunk/src/cheese-dbus.c
   trunk/src/cheese-dbus.h

Modified: trunk/src/cheese-dbus.c
==============================================================================
--- trunk/src/cheese-dbus.c	(original)
+++ trunk/src/cheese-dbus.c	Sat Aug 16 21:31:08 2008
@@ -63,7 +63,7 @@
   klass->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
   if (klass->connection == NULL)
   {
-    g_warning("Unable to connect to dbus: %s", error->message);
+    g_warning ("Unable to connect to dbus: %s", error->message);
     g_error_free (error);
     return;
   }
@@ -100,12 +100,12 @@
                                      DBUS_PATH_DBUS,
                                      DBUS_INTERFACE_DBUS);
   
-  if(!org_freedesktop_DBus_request_name (proxy,
-                                         "org.gnome.Cheese",
-                                         0, &request_ret,    /* See tutorial for more infos about these */
-                                         &error))
+  if (!org_freedesktop_DBus_request_name (proxy,
+                                          "org.gnome.Cheese",
+                                          0, &request_ret,
+                                          &error))
   {
-    g_warning("Unable to register service: %s", error->message);
+    g_warning ("Unable to register service: %s", error->message);
     g_error_free (error);
   }
 	
@@ -113,8 +113,6 @@
   if (request_ret == DBUS_REQUEST_NAME_REPLY_EXISTS ||
       request_ret == DBUS_REQUEST_NAME_REPLY_IN_QUEUE)
   {
-    gboolean return_value;
-	  
     g_warning ("Another instance of cheese is already running!");
 	  
     /*notify the other instance of cheese*/
@@ -123,7 +121,7 @@
                                        "/org/gnome/cheese",
                                        "org.gnome.Cheese");
       
-    if(!dbus_g_proxy_call (proxy, "notify", &error, G_TYPE_INVALID, G_TYPE_INVALID))
+    if (!dbus_g_proxy_call (proxy, "notify", &error, G_TYPE_INVALID, G_TYPE_INVALID))
     {
       /* Method failed, the GError is set, let's warn everyone */
       g_warning ("Notifying the other cheese instance failed: %s", error->message);

Modified: trunk/src/cheese-dbus.h
==============================================================================
--- trunk/src/cheese-dbus.h	(original)
+++ trunk/src/cheese-dbus.h	Sat Aug 16 21:31:08 2008
@@ -31,11 +31,11 @@
 {
   GObjectClass parent_class;
   DBusGConnection *connection;
-}CheeseDbusClass;
+} CheeseDbusClass;
 
-typedef struct _CheeseDbus{
+typedef struct _CheeseDbus {
   GObject parent;
-}CheeseDbus;
+} CheeseDbus;
 
 
 #define CHEESE_TYPE_DBUS            (cheese_dbus_get_type ())
@@ -45,15 +45,10 @@
 #define CHEESE_IS_DBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  CHEESE_TYPE_DBUS))
 #define CHEESE_DBUS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  CHEESE_TYPE_DBUS, CheeseDbusClass))
 
-
-GType
-cheese_dbus_get_type (void);
-CheeseDbus *
-cheese_dbus_new (void);
-void
-cheese_dbus_set_window (gpointer);
-gboolean
-cheese_dbus_notify (void);
+GType cheese_dbus_get_type (void);
+CheeseDbus * cheese_dbus_new (void);
+void cheese_dbus_set_window (gpointer);
+gboolean cheese_dbus_notify (void);
 
 G_END_DECLS