diff -up meego-panel-devices-0.2.4/gpm/gpm-brightness-xrandr.c.no-GDK_DISPLAY meego-panel-devices-0.2.4/gpm/gpm-brightness-xrandr.c
--- meego-panel-devices-0.2.4/gpm/gpm-brightness-xrandr.c.no-GDK_DISPLAY 2010-10-01 16:19:44.968924013 -0400
+++ meego-panel-devices-0.2.4/gpm/gpm-brightness-xrandr.c 2010-10-01 16:21:16.011923753 -0400
@@ -161,7 +161,7 @@ gpm_brightness_xrandr_setup_display (Gpm
g_return_val_if_fail (GPM_IS_BRIGHTNESS_XRANDR (brightness), FALSE);
/* get the display */
- brightness->priv->dpy = GDK_DISPLAY();
+ brightness->priv->dpy = gdk_display_get_default();
if (!brightness->priv->dpy) {
g_critical ("Cannot open display");
return FALSE;
@@ -196,7 +196,7 @@ gpm_brightness_xrandr_setup_version (Gpm
g_return_val_if_fail (GPM_IS_BRIGHTNESS_XRANDR (brightness), FALSE);
/* get the display */
- brightness->priv->dpy = GDK_DISPLAY();
+ brightness->priv->dpy = gdk_display_get_default();
if (!brightness->priv->dpy) {
g_critical ("Cannot open display");
return FALSE;
@@ -735,7 +735,7 @@ gpm_brightness_xrandr_init (GpmBrightnes
display = gdk_display_get_default ();
/* as we a filtering by a window, we have to add an event type */
- if (!XRRQueryExtension (GDK_DISPLAY(), &event_base, &ignore)) {
+ if (!XRRQueryExtension (gdk_display_get_default(), &event_base, &ignore)) {
g_critical ("can't get event_base for XRR");
}
gdk_x11_register_standard_event_type (display, event_base, RRNotify + 1);
@@ -743,7 +743,7 @@ gpm_brightness_xrandr_init (GpmBrightnes
/* don't abort on error */
gdk_error_trap_push ();
- XRRSelectInput (GDK_DISPLAY(), GDK_WINDOW_XID (window),
+ XRRSelectInput (gdk_display_get_default(), GDK_WINDOW_XID (window),
RRScreenChangeNotifyMask |
RROutputPropertyNotifyMask); /* <--- the only one we need, but see rh:345551 */
gdk_flush ();
diff -up meego-panel-devices-0.2.4/power-icon/src/mpd-global-key.c.no-GDK_DISPLAY meego-panel-devices-0.2.4/power-icon/src/mpd-global-key.c
--- meego-panel-devices-0.2.4/power-icon/src/mpd-global-key.c.no-GDK_DISPLAY 2010-07-16 07:50:28.000000000 -0400
+++ meego-panel-devices-0.2.4/power-icon/src/mpd-global-key.c 2010-10-01 16:17:09.668924001 -0400
@@ -63,7 +63,7 @@ window_grab_key (GdkWindow *window,
unsigned int key_code,
GError **error)
{
- Display *dpy = GDK_DISPLAY ();
+ Display *dpy = gdk_display_get_default();
unsigned int mask = AnyModifier;
int ret;
@@ -194,7 +194,7 @@ _dispose (GObject *object)
if (priv->key_code)
{
- Display *dpy = GDK_DISPLAY ();
+ Display *dpy = gdk_display_get_default();
GdkWindow *root_window = gdk_screen_get_root_window (
gdk_screen_get_default ());
diff -up meego-panel-devices-0.2.4/power-icon/src/mpd-power-icon.c.no-GDK_DISPLAY meego-panel-devices-0.2.4/power-icon/src/mpd-power-icon.c
--- meego-panel-devices-0.2.4/power-icon/src/mpd-power-icon.c.no-GDK_DISPLAY 2010-07-16 07:50:28.000000000 -0400
+++ meego-panel-devices-0.2.4/power-icon/src/mpd-power-icon.c 2010-10-01 16:17:09.672924000 -0400
@@ -450,7 +450,7 @@ mpd_power_icon_init (MpdPowerIcon *self)
priv->idle_manager = mpd_idle_manager_new ();
/* Shutdown key. */
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_PowerOff);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_PowerOff);
if (key_code)
{
priv->shutdown_key = mpd_global_key_new (key_code);
@@ -462,7 +462,7 @@ mpd_power_icon_init (MpdPowerIcon *self)
}
/* Sleep key. */
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_Sleep);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_Sleep);
if (key_code)
{
priv->sleep_key = mpd_global_key_new (key_code);
@@ -478,7 +478,7 @@ mpd_power_icon_init (MpdPowerIcon *self)
if (mpd_display_device_is_enabled (priv->display))
{
/* Brightness keys. */
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_MonBrightnessUp);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_MonBrightnessUp);
if (key_code)
{
priv->brightness_up_key = mpd_global_key_new (key_code);
@@ -488,7 +488,7 @@ mpd_power_icon_init (MpdPowerIcon *self)
} else {
g_warning ("Failed to query XF86XK_MonBrightnessUp key code.");
}
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_MonBrightnessDown);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_MonBrightnessDown);
if (key_code)
{
priv->brightness_down_key = mpd_global_key_new (key_code);
diff -up meego-panel-devices-0.2.4/power-icon/tests/test-brightness-keys.c.no-GDK_DISPLAY meego-panel-devices-0.2.4/power-icon/tests/test-brightness-keys.c
--- meego-panel-devices-0.2.4/power-icon/tests/test-brightness-keys.c.no-GDK_DISPLAY 2010-10-01 16:18:26.472925359 -0400
+++ meego-panel-devices-0.2.4/power-icon/tests/test-brightness-keys.c 2010-10-01 16:18:58.813924396 -0400
@@ -50,7 +50,7 @@ main (int argc,
gtk_clutter_init (&argc, &argv);
/* Brightness keys. */
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_MonBrightnessUp);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_MonBrightnessUp);
if (key_code)
{
brightness_up_key = mpd_global_key_new (key_code);
@@ -61,7 +61,7 @@ main (int argc,
g_warning ("Failed to query XF86XK_MonBrightnessUp key code.");
}
- key_code = XKeysymToKeycode (GDK_DISPLAY (), XF86XK_MonBrightnessDown);
+ key_code = XKeysymToKeycode (gdk_display_get_default(), XF86XK_MonBrightnessDown);
if (key_code)
{
brightness_down_key = mpd_global_key_new (key_code);
diff -up meego-panel-devices-0.2.4/power-icon/tests/test-key.c.no-GDK_DISPLAY meego-panel-devices-0.2.4/power-icon/tests/test-key.c
--- meego-panel-devices-0.2.4/power-icon/tests/test-key.c.no-GDK_DISPLAY 2010-10-01 16:20:24.743925317 -0400
+++ meego-panel-devices-0.2.4/power-icon/tests/test-key.c 2010-10-01 16:20:41.006923893 -0400
@@ -19,12 +19,12 @@ main (int argc,
}
gtk_init (&argc, &argv);
- fk = fakekey_init (GDK_DISPLAY ());
+ fk = fakekey_init (gdk_display_get_default());
sscanf (argv[1], "%X", (unsigned int *) &keysym);
printf ("%X\n", (unsigned int) keysym);
- keycode = XKeysymToKeycode (GDK_DISPLAY (), keysym);
+ keycode = XKeysymToKeycode (gdk_display_get_default(), keysym);
fakekey_send_keyevent (fk, keycode, True, 0);
fakekey_send_keyevent (fk, keycode, False, 0);
