fix formatting

Signed-off-by: Chris Michael <cp.michael@samsung.com>

5 files changed, 47 insertions, 38 deletions

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b9fda4ecf3..15349b5d61 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2193,8 +2193,7 @@ _e_client_frame_update(E_Client *ec)
      bordername = ec->bordername;
    else if (ec->mwm.borderless)
      bordername = "borderless";
-   else if (((ec->icccm.transient_for != 0) ||
-             (ec->dialog)) &&
+   else if (((ec->icccm.transient_for != 0) || (ec->dialog)) &&
             (ec->icccm.min_w == ec->icccm.max_w) &&
             (ec->icccm.min_h == ec->icccm.max_h))
      bordername = "noresize_dialog";
@@ -2209,8 +2208,8 @@ _e_client_frame_update(E_Client *ec)
      bordername = "nofocus";
    else if (ec->urgent)
      bordername = "urgent";
-   else if ((ec->icccm.transient_for != 0) ||
-            (ec->dialog))
+   else if (((ec->icccm.transient_for != 0) || (ec->dialog)) && 
+            (e_pixmap_is_x(ec->pixmap)))
      bordername = "dialog";
    else if (ec->netwm.state.modal)
      bordername = "modal";
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index d958dbae61..730c7cf2a3 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -49,7 +49,10 @@ _e_comp_wl_buffer_pending_cb_destroy(struct wl_listener *listener, void *data EI
 {
    E_Comp_Wl_Client_Data *cd;
 
-   cd = container_of(listener, E_Comp_Wl_Client_Data, pending.buffer_destroy);
+   if (!(cd = container_of(listener, E_Comp_Wl_Client_Data, 
+                           pending.buffer_destroy)))
+     return;
+
    cd->pending.buffer = NULL;
 }
 
@@ -58,7 +61,9 @@ _e_comp_wl_buffer_cb_destroy(struct wl_listener *listener, void *data EINA_UNUSE
 {
    E_Comp_Wl_Buffer *buffer;
 
-   buffer = container_of(listener, E_Comp_Wl_Buffer, destroy_listener);
+   if (!(buffer = container_of(listener, E_Comp_Wl_Buffer, destroy_listener)))
+     return;
+
    wl_signal_emit(&buffer->destroy_signal, buffer);
    free(buffer);
 }
@@ -130,7 +135,7 @@ _e_comp_wl_surface_cb_attach(struct wl_client *client, struct wl_resource *resou
 {
    E_Pixmap *cp;
    E_Client *ec;
-   E_Comp_Wl_Buffer *buffer;
+   E_Comp_Wl_Buffer *buffer = NULL;
 
    if (!(cp = wl_resource_get_user_data(resource))) return;
 
@@ -1083,8 +1088,7 @@ _e_comp_wl_client_priority_normal(E_Client *ec)
 {
    if (ec->netwm.pid <= 0) return;
    if (ec->netwm.pid == getpid()) return;
-   _e_comp_wl_client_priority_adjust(ec->netwm.pid, 
-                                     e_config->priority, 1, 
+   _e_comp_wl_client_priority_adjust(ec->netwm.pid, e_config->priority, 1, 
                                      EINA_FALSE, EINA_TRUE, EINA_FALSE);
 }
 
@@ -1834,7 +1838,7 @@ _e_comp_wl_cb_hook_client_new(void *data EINA_UNUSED, E_Client *ec)
    win = e_pixmap_window_get(ec->pixmap);
    ec->ignored = e_comp_ignore_win_find(win);
 
-   /* NB: could not find a better place todo this, BUT for internal windows, 
+   /* NB: could not find a better place to do this, BUT for internal windows, 
     * we need to set delete_request else the close buttons on the frames do 
     * basically nothing */
    if (ec->internal) ec->icccm.delete_request = EINA_TRUE;
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 8f56a0e2bb..cb8eaad5e9 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -204,7 +204,8 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
    cfd->dia->data = cfd;
    e_dialog_title_set(cfd->dia, cfd->title);
    cfdata = cfd->cfdata;
-   if (cfd->view->create_cfdata && (!cfd->cfdata)) cfd->cfdata = cfd->view->create_cfdata(cfd);
+   if (cfd->view->create_cfdata && (!cfd->cfdata)) 
+     cfd->cfdata = cfd->view->create_cfdata(cfd);
 
    evas = e_win_evas_get(cfd->dia->win);
    if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 9b2991bb80..8e198103ea 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -215,8 +215,7 @@ _e_pointer_stack_free(E_Pointer_Stack *elem)
 }
 
 static void
-_e_pointer_type_set(E_Pointer *p,
-                    const char *type)
+_e_pointer_type_set(E_Pointer *p, const char *type)
 {
    if (!p) return;
 
@@ -551,8 +550,7 @@ e_pointer_shutdown(void)
 }
 
 EAPI E_Pointer *
-e_pointer_window_new(Ecore_Window win,
-                     int filled)
+e_pointer_window_new(Ecore_Window win, int filled)
 {
    E_Pointer *p = NULL;
 
@@ -733,9 +731,7 @@ e_pointer_hide(E_Pointer *p)
 }
 
 EAPI void
-e_pointer_type_push(E_Pointer *p,
-                    void *obj,
-                    const char *type)
+e_pointer_type_push(E_Pointer *p, void *obj, const char *type)
 {
    E_Pointer_Stack *stack;
 
@@ -764,9 +760,7 @@ e_pointer_type_push(E_Pointer *p,
 }
 
 EAPI void
-e_pointer_type_pop(E_Pointer *p,
-                   void *obj,
-                   const char *type)
+e_pointer_type_pop(E_Pointer *p, void *obj, const char *type)
 {
    Eina_List *l, *l_next;
    E_Pointer_Stack *stack;
diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
index bc507a44e2..2df08679c8 100644
--- a/src/bin/e_xsettings.c
+++ b/src/bin/e_xsettings.c
@@ -38,17 +38,17 @@ struct _Setting
    const char    *name;
 
    struct
-   {
+     {
       const char *value;
-   } s;
+     } s;
    struct
-   {
+     {
       int value;
-   } i;
+     } i;
    struct
-   {
+     {
       unsigned short red, green, blue, alpha;
-   } c;
+     } c;
 
    unsigned long length;
    unsigned long last_change;
@@ -78,6 +78,7 @@ static Ecore_X_Atom
 _e_xsettings_atom_screen_get(int screen_num)
 {
    char buf[32];
+
    snprintf(buf, sizeof(buf), "_XSETTINGS_S%d", screen_num);
    return ecore_x_atom_get(buf);
 }
@@ -90,7 +91,8 @@ _e_xsettings_selection_owner_set(Settings_Manager *sm)
    Eina_Bool ret;
 
    atom = _e_xsettings_atom_screen_get(sm->man->num);
-   ecore_x_selection_owner_set(sm->man->comp->cm_selection, atom, ecore_x_current_time_get());
+   ecore_x_selection_owner_set(sm->man->comp->cm_selection, atom, 
+                               ecore_x_current_time_get());
    ecore_x_sync();
    cur_selection = ecore_x_selection_owner_get(atom);
 
@@ -164,7 +166,7 @@ _e_xsettings_retry(Settings_Manager *sm)
 {
    if (sm->timer_retry) return;
    sm->timer_retry = ecore_timer_add
-       (RETRY_TIMEOUT, _e_xsettings_activate_retry, sm);
+     (RETRY_TIMEOUT, _e_xsettings_activate_retry, sm);
 }
 
 static void
@@ -378,7 +380,8 @@ _e_xsettings_gtk_icon_update(void)
    EINA_LIST_FOREACH(e_comp_list(), l, c)
      EINA_LIST_FOREACH(c->clients, ll, ec)
        if (ec->icccm.state)
-         ecore_x_client_message8_send(e_client_util_win_get(ec), _atom_gtk_iconthemes, NULL, 0);
+         ecore_x_client_message8_send(e_client_util_win_get(ec), 
+                                      _atom_gtk_iconthemes, NULL, 0);
 }
 
 static void
@@ -391,7 +394,8 @@ _e_xsettings_gtk_rcfiles_update(void)
    EINA_LIST_FOREACH(e_comp_list(), l, c)
      EINA_LIST_FOREACH(c->clients, ll, ec)
        if (ec->icccm.state)
-         ecore_x_client_message8_send(e_client_util_win_get(ec), _atom_gtk_rcfiles, NULL, 0);
+         ecore_x_client_message8_send(e_client_util_win_get(ec), 
+                                      _atom_gtk_rcfiles, NULL, 0);
 }
 
 static void
@@ -427,8 +431,10 @@ _e_xsettings_error_cb(void *data, Eio_File *handler __UNUSED__, int error __UNUS
         reset = EINA_FALSE;
         if (l)
           {
-             snprintf(buf, sizeof(buf), "%s/themes/%s", (char *)eina_list_data_get(l), _setting_theme);
-             eio_op = eio_file_direct_stat(buf, _e_xsettings_done_cb, _e_xsettings_error_cb, l);
+             snprintf(buf, sizeof(buf), "%s/themes/%s", 
+                      (char *)eina_list_data_get(l), _setting_theme);
+             eio_op = eio_file_direct_stat(buf, _e_xsettings_done_cb, 
+                                           _e_xsettings_error_cb, l);
              return;
           }
      }
@@ -437,7 +443,8 @@ _e_xsettings_error_cb(void *data, Eio_File *handler __UNUSED__, int error __UNUS
    _setting_theme = NULL;
 
    if (e_config->xsettings.net_theme_name)
-     _e_xsettings_string_set(_setting_theme_name, e_config->xsettings.net_theme_name);
+     _e_xsettings_string_set(_setting_theme_name, 
+                             e_config->xsettings.net_theme_name);
    else
      _e_xsettings_string_set(_setting_theme_name, NULL);
    _e_xsettings_update();
@@ -473,8 +480,10 @@ _e_xsettings_theme_set(void)
                {
                   char buf[PATH_MAX];
 
-                  e_user_homedir_snprintf(buf, sizeof(buf), ".themes/%s", _setting_theme);
-                  eio_op = eio_file_direct_stat(buf, _e_xsettings_done_cb, _e_xsettings_error_cb, NULL);
+                  e_user_homedir_snprintf(buf, sizeof(buf), 
+                                          ".themes/%s", _setting_theme);
+                  eio_op = eio_file_direct_stat(buf, _e_xsettings_done_cb, 
+                                                _e_xsettings_error_cb, NULL);
                   setting = EINA_TRUE;
                   return;
                }
@@ -525,7 +534,8 @@ _e_xsettings_font_set(void)
                   eina_strbuf_append_char(buf, ' ');
                }
              eina_strbuf_append(buf, size_buf);
-             _e_xsettings_string_set(_setting_font_name, eina_strbuf_string_get(buf));
+             _e_xsettings_string_set(_setting_font_name, 
+                                     eina_strbuf_string_get(buf));
              eina_strbuf_free(buf);
              e_font_properties_free(efp);
              return;
@@ -542,7 +552,8 @@ static void
 _e_xsettings_xft_set(void)
 {
    if (e_config->scale.use_dpi)
-     _e_xsettings_int_set(_setting_xft_dpi, e_config->scale.base_dpi, EINA_TRUE);
+     _e_xsettings_int_set(_setting_xft_dpi, 
+                          e_config->scale.base_dpi, EINA_TRUE);
    else
      _e_xsettings_int_set(_setting_xft_dpi, 0, EINA_FALSE);
 }