applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all references to #ifdef HAVE_GTK_MULTIHEAD Patch from Kjartan

Browse source 
2004-06-27  Rodney Dawes  <dobey@novell.com>

	* applier.c: Remove all references to #ifdef HAVE_GTK_MULTIHEAD
	Patch from Kjartan Maraas <kmaraas@gnome.org>

	Fixes #142749
This commit is contained in:
Rodney Dawes 2004-06-28 03:39:56 +00:00 • committed by Rodney Dawes
parent 17606cbd44
commit 331f5ad61c
2 changed files with 7 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libbackground/ChangeLog
View file

@ -1,3 +1,10 @@
2004-06-27 Rodney Dawes <dobey@novell.com>
* applier.c: Remove all references to #ifdef HAVE_GTK_MULTIHEAD
Patch from Kjartan Maraas <kmaraas@gnome.org>
Fixes #142749
2004-04-15 Jody Goldberg <jody@gnome.org> 2004-04-15 Jody Goldberg <jody@gnome.org>
* Release 2.6.1 * Release 2.6.1

32
libbackground/applier.c
View file

@ -274,7 +274,6 @@ bg_applier_class_init (BGApplierClass *class)
1, 65535, MONITOR_CONTENTS_DEFAULT_HEIGHT, 1, 65535, MONITOR_CONTENTS_DEFAULT_HEIGHT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
#ifdef HAVE_GTK_MULTIHEAD
g_object_class_install_property g_object_class_install_property
(object_class, PROP_SCREEN, (object_class, PROP_SCREEN,
g_param_spec_object ("screen", g_param_spec_object ("screen",
@ -282,7 +281,6 @@ bg_applier_class_init (BGApplierClass *class)
_("Screen on which BGApplier is to draw"), _("Screen on which BGApplier is to draw"),
GDK_TYPE_SCREEN, GDK_TYPE_SCREEN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
#endif
parent_class = parent_class =
G_OBJECT_CLASS (g_type_class_ref (G_TYPE_OBJECT)); G_OBJECT_CLASS (g_type_class_ref (G_TYPE_OBJECT));
@ -354,7 +352,6 @@ bg_applier_set_prop (GObject *object, guint prop_id, const GValue *value, GParam
bg_applier->p->render_geom.height = g_value_get_uint (value); bg_applier->p->render_geom.height = g_value_get_uint (value);
break; break;
#ifdef HAVE_GTK_MULTIHEAD
case PROP_SCREEN: case PROP_SCREEN:
if (bg_applier->p->type == BG_APPLIER_ROOT) { if (bg_applier->p->type == BG_APPLIER_ROOT) {
if (bg_applier->p->size_changed_cb_id) if (bg_applier->p->size_changed_cb_id)
@ -368,7 +365,6 @@ bg_applier_set_prop (GObject *object, guint prop_id, const GValue *value, GParam
G_CALLBACK (size_changed_cb), bg_applier); G_CALLBACK (size_changed_cb), bg_applier);
} }
break; break;
#endif
default: default:
g_warning ("Bad property set"); g_warning ("Bad property set");
@ -391,11 +387,9 @@ bg_applier_get_prop (GObject *object, guint prop_id, GValue *value, GParamSpec *
g_value_set_int (value, bg_applier->p->type); g_value_set_int (value, bg_applier->p->type);
break; break;
#ifdef HAVE_GTK_MULTIHEAD
case PROP_SCREEN: case PROP_SCREEN:
g_value_set_object (value, bg_applier->p->screen); g_value_set_object (value, bg_applier->p->screen);
break; break;
#endif
default: default:
g_warning ("Bad property get"); g_warning ("Bad property get");
@ -482,15 +476,10 @@ bg_applier_new_for_screen (BGApplierType type,
g_return_val_if_fail (type == BG_APPLIER_ROOT, NULL); g_return_val_if_fail (type == BG_APPLIER_ROOT, NULL);
#ifdef HAVE_GTK_MULTIHEAD
object = g_object_new (bg_applier_get_type (), object = g_object_new (bg_applier_get_type (),
"type", type, "type", type,
"screen", screen, "screen", screen,
NULL); NULL);
#else
object = bg_applier_new (type);
#endif
return object; return object;
} }
@ -1607,19 +1596,11 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height)
GdkPixmap *gdk_pixmap; GdkPixmap *gdk_pixmap;
int screen_num; int screen_num;
#ifdef HAVE_GTK_MULTIHEAD
screen_num = gdk_screen_get_number (screen); screen_num = gdk_screen_get_number (screen);
#else
screen_num = DefaultScreen (GDK_DISPLAY ());
#endif
gdk_flush (); gdk_flush ();
#ifdef HAVE_GTK_MULTIHEAD
display_name = DisplayString (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); display_name = DisplayString (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
#else
display_name = DisplayString (GDK_DISPLAY ());
#endif
display = XOpenDisplay (display_name); display = XOpenDisplay (display_name);
@ -1639,13 +1620,8 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height)
XCloseDisplay (display); XCloseDisplay (display);
gdk_pixmap = gdk_pixmap_foreign_new (result); gdk_pixmap = gdk_pixmap_foreign_new (result);
#ifdef HAVE_GTK_MULTIHEAD
gdk_drawable_set_colormap (GDK_DRAWABLE (gdk_pixmap), gdk_drawable_set_colormap (GDK_DRAWABLE (gdk_pixmap),
gdk_drawable_get_colormap (gdk_screen_get_root_window (screen))); gdk_drawable_get_colormap (gdk_screen_get_root_window (screen)));
#else
gdk_drawable_set_colormap (GDK_DRAWABLE (gdk_pixmap),
gdk_drawable_get_colormap (gdk_get_default_root_window ()));
#endif
return gdk_pixmap; return gdk_pixmap;
} }
@ -1673,22 +1649,14 @@ set_root_pixmap (GdkPixmap *pixmap, GdkScreen *screen)
if (is_nautilus_running ()) if (is_nautilus_running ())
return; return;
#ifdef HAVE_GTK_MULTIHEAD
screen_num = gdk_screen_get_number (screen); screen_num = gdk_screen_get_number (screen);
#else
screen_num = DefaultScreen (GDK_DISPLAY ());
#endif
if (pixmap != NULL) if (pixmap != NULL)
pixmap_id = GDK_WINDOW_XWINDOW (pixmap); pixmap_id = GDK_WINDOW_XWINDOW (pixmap);
else else
pixmap_id = 0; pixmap_id = 0;
#ifdef HAVE_GTK_MULTIHEAD
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
#else
display = GDK_DISPLAY ();
#endif
XGrabServer (display); XGrabServer (display);