consistant glib type usage

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 544bcdbd9ea2bbf064a9ef383ca0d3b8fcb280be..b0fc5c20a7f0bfb1fb5339c29baed835b21d81ed 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -54,7 +54,7 @@ guint    screen_last_desktop;
 Size     screen_physical_size;
 gboolean screen_showing_desktop;
 DesktopLayout screen_desktop_layout;
-char   **screen_desktop_names;
+gchar  **screen_desktop_names;
 Window   screen_support_win;
 
 static Rect  **area; /* array of desktop holding array of xinerama areas */
@@ -64,7 +64,7 @@ static ObPagerPopup *desktop_cycle_popup;
 
 static gboolean replace_wm()
 {
-    char *wm_sn;
+    gchar *wm_sn;
     Atom wm_sn_atom;
     Window current_wm_sn_owner;
     Time timestamp;
@@ -281,7 +281,7 @@ void screen_startup(gboolean reconfig)
         screen_resize();
 
     /* set the names */
-    screen_desktop_names = g_new(char*,
+    screen_desktop_names = g_new(gchar*,
                                  g_slist_length(config_desktops_names) + 1);
     for (i = 0, it = config_desktops_names; it; ++i, it = it->next)
         screen_desktop_names[i] = it->data; /* dont strdup */
@@ -336,8 +336,8 @@ void screen_shutdown(gboolean reconfig)
 
 void screen_resize()
 {
-    static int oldw = 0, oldh = 0;
-    int w, h;
+    static gint oldw = 0, oldh = 0;
+    gint w, h;
     GList *it;
     guint32 geometry[2];
 
@@ -850,7 +850,7 @@ void screen_update_desktop_names()
     else
         i = 0;
     if (i <= screen_num_desktops) {
-        screen_desktop_names = g_renew(char*, screen_desktop_names,
+        screen_desktop_names = g_renew(gchar*, screen_desktop_names,
                                        screen_num_desktops + 1);
         screen_desktop_names[screen_num_desktops] = NULL;
         for (; i < screen_num_desktops; ++i)
@@ -867,23 +867,23 @@ void screen_show_desktop(gboolean show)
     screen_showing_desktop = show;
 
     if (show) {
-       /* bottom to top */
-       for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
+        /* bottom to top */
+        for (it = g_list_last(stacking_list); it != NULL; it = it->prev) {
             if (WINDOW_IS_CLIENT(it->data)) {
                 ObClient *client = it->data;
                 if (client->frame->visible && !client_should_show(client))
                     frame_hide(client->frame);
             }
-       }
+        }
     } else {
         /* top to bottom */
-       for (it = stacking_list; it != NULL; it = it->next) {
+        for (it = stacking_list; it != NULL; it = it->next) {
             if (WINDOW_IS_CLIENT(it->data)) {
                 ObClient *client = it->data;
                 if (!client->frame->visible && client_should_show(client))
                     frame_show(client->frame);
             }
-       }
+        }
     }
 
     if (show) {
@@ -1190,10 +1190,10 @@ void screen_set_root_cursor()
                       ob_cursor(OB_CURSOR_POINTER));
 }
 
-gboolean screen_pointer_pos(int *x, int *y)
+gboolean screen_pointer_pos(gint *x, gint *y)
 {
     Window w;
-    int i;
+    gint i;
     guint u;
 
     return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),