aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell-meego.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-25 22:15:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-25 22:15:32 +0800
commit96538878911586a9e9ca26b81e1916c04e538980 (patch)
treeffcfe184bab289d6917a65d850bc4ba310be0447 /shell/e-shell-meego.c
parent3e1b34841d3a699f77848f5de019f18ccb2d1ca1 (diff)
downloadgsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.gz
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.tar.zst
gsoc2013-evolution-96538878911586a9e9ca26b81e1916c04e538980.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'shell/e-shell-meego.c')
-rw-r--r--shell/e-shell-meego.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 3e1bb8a393..0b54250498 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -38,7 +38,7 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
{
Window *wm_window_v = NULL;
- unsigned char *moblin_string = NULL;
+ guchar *moblin_string = NULL;
GModule *module = NULL;
/*
* Wow - this is unpleasant, but it is hard to link directly
@@ -46,22 +46,22 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
* to get to the (mind-mashed) 'supporting' window.
*/
struct {
- int (*XFree) (void *);
- int (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool,
- Atom, Atom *, int *, unsigned long*,
- unsigned long*, unsigned char**);
+ gint (*XFree) (gpointer);
+ gint (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool,
+ Atom, Atom *, gint *, unsigned long*,
+ unsigned long*, guchar **);
} fns = { 0, 0 };
*is_meego = *small_screen = FALSE;
- moblin_string = (unsigned char *)g_getenv ("EVO_MEEGO");
+ moblin_string = (guchar *)g_getenv ("EVO_MEEGO");
if (!moblin_string) {
GdkScreen *screen;
GdkDisplay *display;
GdkAtom wm_win, mob_atom;
Atom dummy_t;
unsigned long dummy_l;
- int dummy_i;
+ gint dummy_i;
if (!gdk_display_get_default ())
return;
@@ -88,12 +88,12 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
gdk_error_trap_push ();
/* get the window manager's supporting window */
- fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
+ fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
GDK_WINDOW_XID (gdk_screen_get_root_window (screen)),
gdk_x11_atom_to_xatom_for_display (display, wm_win),
0, 1, False, XA_WINDOW, &dummy_t, &dummy_i,
- &dummy_l, &dummy_l, (unsigned char **)(&wm_window_v));
-
+ &dummy_l, &dummy_l, (guchar **)(&wm_window_v));
+
/* get the '_Moblin' setting */
if (wm_window_v && (*wm_window_v != None))
fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v,
@@ -101,13 +101,13 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
0, 8192, False, XA_STRING,
&dummy_t, &dummy_i, &dummy_l, &dummy_l,
&moblin_string);
-
+
gdk_error_trap_pop ();
}
if (moblin_string) {
- int i;
- char **props;
+ gint i;
+ gchar **props;
g_warning ("prop '%s'", moblin_string);
@@ -116,7 +116,7 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
props = g_strsplit ((gchar *)moblin_string, ":", -1);
for (i = 0; props && props[i]; i++) {
- char **pair = g_strsplit (props[i], "=", 2);
+ gchar **pair = g_strsplit (props[i], "=", 2);
g_warning ("pair '%s'='%s'", pair ? pair[0] : "<null>",
pair && pair[0] ? pair[1] : "<null>");
@@ -143,7 +143,7 @@ void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen)
/* gcc -g -O0 -Wall -I. -DTEST_APP `pkg-config --cflags --libs gtk+-2.0` e-shell-meego.c && ./a.out */
#include <gtk/gtk.h>
-int main (int argc, char **argv)
+gint main (gint argc, gchar **argv)
{
gboolean is_meego, small_screen;