Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index a055e63..0ccb343 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -108,7 +108,6 @@ static void client_call_notifies(ObClient *self, GSList *list);
 static void client_ping_event(ObClient *self, gboolean dead);
 static void client_prompt_kill(ObClient *self);
 
-
 void client_startup(gboolean reconfig)
 {
     if ((client_default_icon = RrImageCacheFind(ob_rr_icons,
@@ -583,7 +582,6 @@ void client_manage(Window window, ObPrompt *prompt)
     hooks_queue(OB_HOOK_WIN_NEW, self);
 }
 
-
 ObClient *client_fake_manage(Window window)
 {
     ObClient *self;
@@ -1310,7 +1308,6 @@ static void client_update_transient_tree(ObClient *self,
       transient windows as their children.
       * * */
 
-
     /* No change has occured */
     if (oldgroup == newgroup &&
         oldgtran == newgtran &&
@@ -2126,7 +2123,6 @@ void client_update_icons(ObClient *self)
                                        (gint*)&w, (gint*)&h, &data);
                 obt_display_ignore_errors(FALSE);
 
-
                 if (xicon) {
                     if (w > 0 && h > 0) {
                         /* is this icon in the cache yet? */
@@ -2623,7 +2619,6 @@ gboolean client_enter_focusable(ObClient *self)
             self->type != OB_CLIENT_TYPE_DESKTOP);
 }
 
-
 static void client_apply_startup_state(ObClient *self,
                                        gint x, gint y, gint w, gint h)
 {
@@ -2933,7 +2928,6 @@ void client_try_configure(ObClient *self, gint *x, gint *y, gint *w, gint *h,
     g_assert(*h > 0);
 }
 
-
 void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
                       gboolean user, gboolean final, gboolean force_reply)
 {