[cheese] reindent cheese source code



commit 17fa056452939d692783da6c51eaeef8ddc17754
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Mon Oct 5 15:52:02 2009 +0200

    reindent cheese source code

 src/cheese-fileutil.c     |   26 +++++++++++++++-----------
 src/cheese-fileutil.h     |    2 +-
 src/cheese-prefs-widget.h |    4 ++--
 src/cheese-webcam.h       |    4 ++--
 src/cheese-window.c       |   10 ++++++----
 5 files changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/src/cheese-fileutil.c b/src/cheese-fileutil.c
index 799f8ea..e232153 100644
--- a/src/cheese-fileutil.c
+++ b/src/cheese-fileutil.c
@@ -40,7 +40,7 @@ typedef struct
   gchar *video_path;
   gchar *photo_path;
   gchar *log_path;
-  gint burst_count;
+  gint   burst_count;
   gchar *burst_raw_name;
 } CheeseFileUtilPrivate;
 
@@ -98,10 +98,11 @@ cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMod
   int        num;
 
   CheeseFileUtilPrivate *priv = CHEESE_FILEUTIL_GET_PRIVATE (fileutil);
+
   tm  = time (NULL);
   ptr = localtime (&tm);
   strftime (date, 20, "%F-%H%M%S", ptr);
-	
+
   if ((mode == CHEESE_MEDIA_MODE_PHOTO) || (mode == CHEESE_MEDIA_MODE_BURST))
     path = cheese_fileutil_get_photo_path (fileutil);
   else
@@ -110,17 +111,20 @@ cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMod
   if (mode == CHEESE_MEDIA_MODE_PHOTO)
   {
     filename = g_strdup_printf ("%s%s%s%s", path, G_DIR_SEPARATOR_S, date, PHOTO_NAME_SUFFIX);
-  }else if (mode == CHEESE_MEDIA_MODE_BURST)
+  }
+  else if (mode == CHEESE_MEDIA_MODE_BURST)
   {
     priv->burst_count++;
-    if (strlen(priv->burst_raw_name)==0)
+    if (strlen (priv->burst_raw_name) == 0)
       priv->burst_raw_name = g_strdup_printf ("%s%s%s", path, G_DIR_SEPARATOR_S, date);
-				
+
     filename = g_strdup_printf ("%s_%d%s", priv->burst_raw_name, priv->burst_count, PHOTO_NAME_SUFFIX);
-  }else{
+  }
+  else
+  {
     filename = g_strdup_printf ("%s%s%s%s", path, G_DIR_SEPARATOR_S, date, VIDEO_NAME_SUFFIX);
   }
-	
+
   file = g_file_new_for_path (filename);
 
   if (g_file_query_exists (file, NULL))
@@ -153,11 +157,11 @@ cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMod
 }
 
 void
-cheese_fileutil_reset_burst(CheeseFileUtil *fileutil)
+cheese_fileutil_reset_burst (CheeseFileUtil *fileutil)
 {
   CheeseFileUtilPrivate *priv = CHEESE_FILEUTIL_GET_PRIVATE (fileutil);
 
-  priv->burst_count = 0;
+  priv->burst_count    = 0;
   priv->burst_raw_name = "";
 }
 
@@ -190,9 +194,9 @@ cheese_fileutil_init (CheeseFileUtil *fileutil)
 {
   CheeseFileUtilPrivate *priv = CHEESE_FILEUTIL_GET_PRIVATE (fileutil);
 
-  priv->burst_count = 0;
+  priv->burst_count    = 0;
   priv->burst_raw_name = "";
-	
+
   CheeseGConf *gconf;
 
   gconf = cheese_gconf_new ();
diff --git a/src/cheese-fileutil.h b/src/cheese-fileutil.h
index 665a727..c9a1063 100644
--- a/src/cheese-fileutil.h
+++ b/src/cheese-fileutil.h
@@ -62,7 +62,7 @@ gchar *cheese_fileutil_get_photo_path (CheeseFileUtil *fileutil);
 gchar *cheese_fileutil_get_path_before_224 (CheeseFileUtil *fileutil);
 gchar *cheese_fileutil_get_log_path (CheeseFileUtil *fileutil);
 gchar *cheese_fileutil_get_new_media_filename (CheeseFileUtil *fileutil, CheeseMediaMode mode);
-void cheese_fileutil_reset_burst(CheeseFileUtil *fileutil);
+void   cheese_fileutil_reset_burst (CheeseFileUtil *fileutil);
 
 G_END_DECLS
 
diff --git a/src/cheese-prefs-widget.h b/src/cheese-prefs-widget.h
index 9a1b310..c20fa71 100644
--- a/src/cheese-prefs-widget.h
+++ b/src/cheese-prefs-widget.h
@@ -44,10 +44,10 @@ struct _CheesePrefsWidgetClass
   GObjectClass parent_class;
 
   /* Signals */
-  void (*changed) (CheesePrefsWidget *self);
+  void (*changed)(CheesePrefsWidget *self);
 
   /* Virtual methods */
-  void (*synchronize) (CheesePrefsWidget *self);
+  void (*synchronize)(CheesePrefsWidget *self);
 };
 
 struct _CheesePrefsWidget
diff --git a/src/cheese-webcam.h b/src/cheese-webcam.h
index 2706ae7..511c8ee 100644
--- a/src/cheese-webcam.h
+++ b/src/cheese-webcam.h
@@ -90,8 +90,8 @@ typedef struct
 typedef struct
 {
   GObjectClass parent_class;
-  void (*photo_saved) (CheeseWebcam *webcam);
-  void (*video_saved) (CheeseWebcam *webcam);
+  void (*photo_saved)(CheeseWebcam *webcam);
+  void (*video_saved)(CheeseWebcam *webcam);
 } CheeseWebcamClass;
 
 
diff --git a/src/cheese-window.c b/src/cheese-window.c
index 623a9c9..88b0d24 100644
--- a/src/cheese-window.c
+++ b/src/cheese-window.c
@@ -1275,10 +1275,12 @@ cheese_window_countdown_picture_cb (gpointer data)
   if (cheese_window->webcam_mode == WEBCAM_MODE_BURST)
   {
     photo_filename = cheese_fileutil_get_new_media_filename (cheese_window->fileutil, CHEESE_MEDIA_MODE_BURST);
-  }else{
-    photo_filename = cheese_fileutil_get_new_media_filename (cheese_window->fileutil, CHEESE_MEDIA_MODE_PHOTO);		
   }
-	
+  else
+  {
+    photo_filename = cheese_fileutil_get_new_media_filename (cheese_window->fileutil, CHEESE_MEDIA_MODE_PHOTO);
+  }
+
   if (cheese_webcam_take_photo (cheese_window->webcam, photo_filename))
   {
     cheese_flash_fire (cheese_window->flash);
@@ -1485,7 +1487,7 @@ cheese_window_action_button_clicked_cb (GtkWidget *widget, CheeseWindow *cheese_
       gtk_action_group_set_sensitive (cheese_window->actions_effects, FALSE);
       gtk_action_group_set_sensitive (cheese_window->actions_toggle, FALSE);
       g_object_get (cheese_window->gconf, "gconf_prop_burst_repeat", &cheese_window->repeat_count, NULL); /* reset burst counter */
-      cheese_fileutil_reset_burst(cheese_window->fileutil); /* reset filename counter */
+      cheese_fileutil_reset_burst (cheese_window->fileutil); /* reset filename counter */
     case WEBCAM_MODE_PHOTO:
       cheese_window_take_photo (cheese_window);
       break;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]