Merge lp:~cimi/overlay-scrollbar/coding-style-on-pointers-and-removed-whitelist into lp:overlay-scrollbar

[Andrea Cimitan]

as in the commit message

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-animation.c'
--- os/os-animation.c	2011-05-18 18:25:13 +0000
+++ os/os-animation.c	2011-06-09 12:48:00 +0000
@@ -37,8 +37,8 @@
   guint32 source_id;
 };
 
-static void os_animation_dispose (GObject* object);
-static void os_animation_finalize (GObject* object);
+static void os_animation_dispose (GObject *object);
+static void os_animation_finalize (GObject *object);
 
 G_DEFINE_TYPE (OsAnimation, os_animation, G_TYPE_OBJECT);
 
@@ -69,7 +69,7 @@
 }
 
 static void
-os_animation_dispose (GObject* object)
+os_animation_dispose (GObject *object)
 {
   OsAnimation *animation;
   OsAnimationPrivate *priv;
@@ -87,7 +87,7 @@
 }
 
 static void
-os_animation_finalize (GObject* object)
+os_animation_finalize (GObject *object)
 {
   G_OBJECT_CLASS (os_animation_parent_class)->finalize (object);
 }
@@ -107,14 +107,14 @@
  * Returns: the pointer to the #OsAnimation
  */
 OsAnimation*
-os_animation_new (gint32 rate,
-                  gint32 duration,
+os_animation_new (gint32                rate,
+                  gint32                duration,
                   OsAnimationUpdateFunc update_func,
-                  OsAnimationEndFunc end_func,
-                  gpointer user_data)
+                  OsAnimationEndFunc    end_func,
+                  gpointer              user_data)
 {
-  OsAnimation* animation;
-  OsAnimationPrivate* priv;
+  OsAnimation *animation;
+  OsAnimationPrivate *priv;
 
   g_return_val_if_fail (rate != 0, NULL);
   g_return_val_if_fail (duration != 0, NULL);
@@ -140,10 +140,10 @@
  * Sets the new duration of the animation
  **/
 void
-os_animation_set_duration (OsAnimation* animation,
-                           gint32 duration)
+os_animation_set_duration (OsAnimation *animation,
+                           gint32       duration)
 {
-  OsAnimationPrivate* priv;
+  OsAnimationPrivate *priv;
 
   g_return_if_fail (animation != NULL);
   g_return_if_fail (duration != 0);
@@ -192,9 +192,9 @@
  * Starts the animation
  **/
 void
-os_animation_start (OsAnimation* animation)
+os_animation_start (OsAnimation *animation)
 {
-  OsAnimationPrivate* priv;
+  OsAnimationPrivate *priv;
 
   g_return_if_fail (animation != NULL);
 
@@ -214,9 +214,9 @@
  * Stops the animation
  **/
 void
-os_animation_stop (OsAnimation* animation)
+os_animation_stop (OsAnimation *animation)
 {
-  OsAnimationPrivate* priv;
+  OsAnimationPrivate *priv;
 
   g_return_if_fail (animation != NULL);
 

=== modified file 'os/os-log.c'
--- os/os-log.c	2011-04-05 16:21:15 +0000
+++ os/os-log.c	2011-06-09 12:48:00 +0000
@@ -35,10 +35,10 @@
 /* Public functions. */
 
 void
-os_log_message (OsLogLevel level, const gchar* function, const gchar* file,
-                gint32 line, const gchar* format, ...)
+os_log_message (OsLogLevel level, const gchar *function, const gchar *file,
+                gint32 line, const gchar *format, ...)
 {
-  static const gchar* prefix[3] = {
+  static const gchar *prefix[3] = {
     "\033[37;01m", /* OS_INFO */
     "\033[33;01m", /* OS_WARN */
     "\033[31;01m"  /* OS_ERROR */

=== modified file 'os/os-private.h'
--- os/os-private.h	2011-05-12 23:39:33 +0000
+++ os/os-private.h	2011-06-09 12:48:00 +0000
@@ -53,8 +53,8 @@
 void
 G_GNUC_NO_INSTRUMENT
 G_GNUC_PRINTF (5, 6)
-os_log_message (OsLogLevel level, const gchar* function, const gchar* file,
-                gint32 line, const gchar* format, ...);
+os_log_message (OsLogLevel level, const gchar *function, const gchar *file,
+                gint32 line, const gchar *format, ...);
 
 /* Macro logging a message to stderr using the given level. */
 #define OS_LOG(level,...)                                                  \
@@ -126,18 +126,18 @@
 
 GType        os_animation_get_type     (void);
 
-OsAnimation* os_animation_new          (gint32 rate,
-                                        gint32 duration,
+OsAnimation* os_animation_new          (gint32                rate,
+                                        gint32                duration,
                                         OsAnimationUpdateFunc update_func,
-                                        OsAnimationEndFunc end_func,
-                                        gpointer user_data);
-
-void         os_animation_set_duration (OsAnimation* animation,
-                                        gint32 duration);
-
-void         os_animation_start        (OsAnimation* animation);
-
-void         os_animation_stop         (OsAnimation* animation);
+                                        OsAnimationEndFunc    end_func,
+                                        gpointer              user_data);
+
+void         os_animation_set_duration (OsAnimation *animation,
+                                        gint32       duration);
+
+void         os_animation_start        (OsAnimation *animation);
+
+void         os_animation_stop         (OsAnimation *animation);
 
 /* os-thumb.c */
 

=== modified file 'os/os-utils.c'
--- os/os-utils.c	2011-06-03 15:45:05 +0000
+++ os/os-utils.c	2011-06-09 12:48:00 +0000
@@ -29,10 +29,10 @@
 /* Public functions. */
 
 gboolean
-os_utils_is_blacklisted (const gchar* program)
+os_utils_is_blacklisted (const gchar *program)
 {
   /* Black-list of program names retrieved with g_get_prgname(). */
-  static const gchar *const blacklist[] = {
+  static const gchar *blacklist[] = {
     "apport-gtk",
     "codeblocks",
     "codelite",
@@ -75,9 +75,3 @@
 
   return FALSE;
 }
-
-gboolean
-os_utils_is_whitelisted (const gchar* program)
-{
-  return TRUE;
-}

=== modified file 'os/os-utils.h'
--- os/os-utils.h	2011-05-19 13:19:14 +0000
+++ os/os-utils.h	2011-06-09 12:48:00 +0000
@@ -32,9 +32,7 @@
 
 G_BEGIN_DECLS
 
-gboolean os_utils_is_blacklisted (const gchar* program);
-
-gboolean os_utils_is_whitelisted (const gchar* program);
+gboolean os_utils_is_blacklisted (const gchar *program);
 
 G_END_DECLS