fix the buildgnome-applets-2_25_1-6_fc11

7 files changed, 253 insertions, 140 deletions

diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
new file mode 100644
index 0000000..ccc0f96
--- /dev/null
+++ b/gnome-applets-libgnomeui.patch
@@ -0,0 +1,245 @@
+diff -up gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui gnome-applets-2.25.1/accessx-status/Makefile.am
+--- gnome-applets-2.25.1/accessx-status/Makefile.am.libgnomeui	2008-06-11 02:34:20.000000000 -0400
++++ gnome-applets-2.25.1/accessx-status/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -1,6 +1,8 @@
+ SUBDIRS = docs pixmaps
+ 
+-INCLUDES = $(GNOME_APPLETS_CFLAGS)
++INCLUDES = \
++	$(GNOME_APPLETS_CFLAGS)	\
++	$(GNOME_LIBS2_CFLAGS)
+ 
+ libexec_PROGRAMS = accessx-status-applet
+ 
+@@ -10,6 +12,7 @@ accessx_status_applet_SOURCES = \
+ 
+ accessx_status_applet_LDADD = \
+ 	$(GNOME_APPLETS_LIBS) \
++	$(GNOME_LIBS2_LIBS) \
+         $(X_LIBS)
+ 
+ serverdir       = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui gnome-applets-2.25.1/charpick/Makefile.am
+--- gnome-applets-2.25.1/charpick/Makefile.am.libgnomeui	2008-06-11 02:31:27.000000000 -0400
++++ gnome-applets-2.25.1/charpick/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES =			\
+ 	-I.			\
+ 	-I$(srcdir)		\
+ 	$(GNOME_APPLETS_CFLAGS)	\
++	$(GNOME_LIBS2_CFLAGS)	\
+ 	$(GUCHARMAP_CFLAGS)
+ 
+ libexec_PROGRAMS = charpick_applet2
+@@ -14,6 +15,7 @@ charpick_applet2_SOURCES = charpick.c \
+ 
+ charpick_applet2_LDADD = \
+ 		       $(GNOME_APPLETS_LIBS)	\
++		       $(GNOME_LIBS2_LIBS)	\
+ 		       $(GUCHARMAP_LIBS)
+ 
+ serverdir       = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui gnome-applets-2.25.1/cpufreq/src/Makefile.am
+--- gnome-applets-2.25.1/cpufreq/src/Makefile.am.libgnomeui	2008-12-19 01:10:06.000000000 -0500
++++ gnome-applets-2.25.1/cpufreq/src/Makefile.am	2008-12-19 01:10:29.000000000 -0500
+@@ -6,6 +6,7 @@ SUBDIRS = $(selector_SUBDIR)
+ 
+ INCLUDES = \
+ 	$(GNOME_APPLETS_CFLAGS) 				\
++	$(GNOME_LIBS2_CFLAGS)					\
+ 	$(LIBGLADE_CFLAGS)
+ 
+ if HAVE_POLKIT_GNOME
+@@ -33,6 +34,7 @@ cpufreq_applet_SOURCES =  \
+ 
+ cpufreq_applet_LDADD =  \
+ 	$(GNOME_APPLETS_LIBS)   	\
++	$(GNOME_LIBS2_LIBS)		\
+ 	$(LIBGLADE_LIBS)		\
+ 	$(LIBCPUFREQ_LIBS)
+ 
+diff -up gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui gnome-applets-2.25.1/drivemount/Makefile.am
+--- gnome-applets-2.25.1/drivemount/Makefile.am.libgnomeui	2008-06-11 02:32:46.000000000 -0400
++++ gnome-applets-2.25.1/drivemount/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -3,7 +3,8 @@ SUBDIRS = help
+ INCLUDES =			\
+ 	-I.			\
+ 	-I$(srcdir)		\
+-	$(GNOME_APPLETS_CFLAGS) 
++	$(GNOME_APPLETS_CFLAGS)	\
++	$(GNOME_LIBS2_CFLAGS)
+ 
+ libexec_PROGRAMS = drivemount_applet2
+ 
+@@ -15,7 +16,8 @@ drivemount_applet2_SOURCES =	\
+ 	drive-button.h
+ 
+ drivemount_applet2_LDADD =	\
+-	$(GNOME_APPLETS_LIBS) 
++	$(GNOME_APPLETS_LIBS)	\ 
++	$(GNOME_LIBS2_LIBS)
+ 
+ serverdir       = $(libdir)/bonobo/servers
+ server_in_files = GNOME_DriveMountApplet.server.in
+diff -up gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui gnome-applets-2.25.1/geyes/Makefile.am
+--- gnome-applets-2.25.1/geyes/Makefile.am.libgnomeui	2008-09-02 05:56:54.000000000 -0400
++++ gnome-applets-2.25.1/geyes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES =						\
+ 	-I.						\
+ 	-I$(srcdir) 					\
+ 	$(GNOME_APPLETS_CFLAGS)				\
++	$(GNOME_LIBS2_CFLAGS)				\
+ 	-I$(includedir) 				\
+ 	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"
+ 
+@@ -14,8 +15,9 @@ geyes_applet2_SOURCES =	\
+ 	themes.c \
+ 	geyes.h
+ 
+-geyes_applet2_LDADD = \
+-	$(GNOME_APPLETS_LIBS)
++geyes_applet2_LDADD = 		\
++	$(GNOME_APPLETS_LIBS)	\
++	$(GNOME_LIBS2_LIBS)
+ 
+ serverdir       = $(libdir)/bonobo/servers
+ server_in_files = GNOME_GeyesApplet.server.in
+diff -up gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui gnome-applets-2.25.1/gswitchit/Makefile.am
+--- gnome-applets-2.25.1/gswitchit/Makefile.am.libgnomeui	2008-06-11 02:27:32.000000000 -0400
++++ gnome-applets-2.25.1/gswitchit/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -23,10 +23,12 @@ COMMON_CFLAGS =				\
+ 	-DG_LOG_DOMAIN=\"GSwitchIt\"	\
+ 	$(LIBGNOMEKBDUI_CFLAGS)		\
+ 	$(GNOME_APPLETS_CFLAGS)		\
++	$(GNOME_LIBS2_CFLAGS)		\
+ 	$(flags_CFLAGS)	
+ 
+ COMMON_LIBS = $(LIBGNOMEKBDUI_LIBS) \
+-	      $(GNOME_APPLETS_LIBS)
++	      $(GNOME_APPLETS_LIBS) \
++	      $(GNOME_LIBS2_LIBS)
+ 
+ libgswitchit_applet_a_CFLAGS = $(COMMON_CFLAGS)
+ 
+diff -up gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui gnome-applets-2.25.1/gweather/Makefile.am
+--- gnome-applets-2.25.1/gweather/Makefile.am.libgnomeui	2008-09-04 19:19:02.000000000 -0400
++++ gnome-applets-2.25.1/gweather/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -7,8 +7,10 @@ INCLUDES =				\
+ 	-I$(top_srcdir)			\
+ 	-DGTK_ENABLE_BROKEN		\
+ 	$(GNOME_APPLETS_CFLAGS)		\
++	$(GNOME_LIBS2_CFLAGS)		\
+ 	$(LIBNOTIFY_CFLAGS)		\
+-	$(LIBGWEATHER_CFLAGS)
++	$(LIBGWEATHER_CFLAGS)		\
++	$(NETWORKMANAGER_CFLAGS)
+ 
+ libexec_PROGRAMS = gweather-applet-2
+ 
+@@ -20,10 +22,12 @@ gweather_applet_2_SOURCES = \
+ 	gweather-dialog.c gweather-dialog.h \
+ 	gweather-applet.c gweather-applet.h
+ 
+-gweather_applet_2_LDADD = \
+-	$(LIBNOTIFY_LIBS) \
++gweather_applet_2_LDADD = 	\
++	$(LIBNOTIFY_LIBS) 	\
+ 	$(GNOME_APPLETS_LIBS)	\
+-	$(LIBGWEATHER_LIBS)
++	$(GNOME_LIBS2_LIBS)	\
++	$(LIBGWEATHER_LIBS) 	\
++	$(NETWORKMANAGER_LIBS)
+ 
+ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_GWeatherApplet.xml
+diff -up gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.1/mini-commander/src/Makefile.am
+--- gnome-applets-2.25.1/mini-commander/src/Makefile.am.libgnomeui	2008-09-02 05:56:55.000000000 -0400
++++ gnome-applets-2.25.1/mini-commander/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -4,6 +4,7 @@ INCLUDES = 				\
+ 	-I.				\
+ 	-I$(srcdir)			\
+ 	$(GNOME_APPLETS_CFLAGS)		\
++	$(GNOME_LIBS2_CFLAGS)		\
+ 	$(WARN_CFLAGS)			\
+ 	$(GNOME_INCLUDEDIR)
+ 
+@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES =			\
+ 	mc-default-macros.h
+ 
+ mini_commander_applet_LDADD =	\
++	$(GNOME_LIBS2_LIBS)	\	
+ 	$(GNOME_APPLETS_LIBS)
+ 
+ mc_install_default_macros_SOURCES =	\
+diff -up gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui gnome-applets-2.25.1/mixer/Makefile.am
+--- gnome-applets-2.25.1/mixer/Makefile.am.libgnomeui	2008-06-11 02:30:36.000000000 -0400
++++ gnome-applets-2.25.1/mixer/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -3,6 +3,7 @@ SUBDIRS = docs
+ INCLUDES = -I. -I$(srcdir) 		\
+ 	$(MIXER_CFLAGS)			\
+ 	$(GNOME_APPLETS_CFLAGS)		\
++	$(GNOME_LIBS2_CFLAGS)		\
+ 	$(GNOMEDESKTOP_CFLAGS)
+ 
+ libexec_PROGRAMS = mixer_applet2
+@@ -22,6 +23,7 @@ noinst_HEADERS = \
+ mixer_applet2_LDADD = 					\
+ 	$(MIXER_LIBS) 					\
+ 	$(GNOME_APPLETS_LIBS)				\
++	$(GNOME_LIBS2_LIBS)				\
+ 	$(GNOMEDESKTOP_LIBS)
+ 
+ serverdir       = $(libdir)/bonobo/servers
+diff -up gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.1/modemlights/Makefile.am
+--- gnome-applets-2.25.1/modemlights/Makefile.am.libgnomeui	2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.25.1/modemlights/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -2,6 +2,7 @@ SUBDIRS = docs
+ 
+ INCLUDES = -I. -I$(srcdir) 				\
+ 	$(GNOME_APPLETS_CFLAGS)				\
++	$(GNOME_LIBS2_CFLAGS)				\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
+ 	-DVERSION=\""$(VERSION)"\"
+ 
+@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
+ 	properties.c
+ 
+ modemlights_applet2_LDADD = \
++		     $(GNOME_LIBS2_LIBS) \
+ 		     $(GNOME_APPLETS_LIBS)
+ 
+ uidir		= $(datadir)/gnome-2.0/ui
+diff -up gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui gnome-applets-2.25.1/stickynotes/Makefile.am
+--- gnome-applets-2.25.1/stickynotes/Makefile.am.libgnomeui	2008-09-29 20:27:02.000000000 -0400
++++ gnome-applets-2.25.1/stickynotes/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -12,6 +12,7 @@ INCLUDES =					\
+ 	-I.					\
+ 	-I$(srcdir)				\
+ 	$(GNOME_APPLETS_CFLAGS)			\
++	$(GNOME_LIBS2_CFLAGS)			\
+ 	$(LIBWNCK_CFLAGS)			\
+ 	$(XML2_CFLAGS)				\
+ 	-DSTICKYNOTES_ICONDIR=\"$(datadir)/pixmaps/stickynotes/\"
+@@ -33,6 +34,7 @@ stickynotes_applet_SOURCES = \
+ stickynotes_applet_LDADD =	\
+ 	$(GNOME_APPLETS_LIBS)	\
+ 	$(LIBWNCK_LIBS)		\
++	$(GNOME_LIBS2_LIBS)	\
+ 	$(XML2_LIBS)
+ 
+ builder_DATA = $(builder_files)
+diff -up gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui gnome-applets-2.25.1/trashapplet/src/Makefile.am
+--- gnome-applets-2.25.1/trashapplet/src/Makefile.am.libgnomeui	2008-06-11 02:26:42.000000000 -0400
++++ gnome-applets-2.25.1/trashapplet/src/Makefile.am	2008-12-19 01:07:09.000000000 -0500
+@@ -1,5 +1,6 @@
+ INCLUDES = -I$(top_srcdir)		\
+ 	   $(GNOME_APPLETS_CFLAGS)	\
++	   $(GNOME_LIBS2_CFLAGS)	\
+ 	   $(GIO_CFLAGS)
+ 
+ libexec_PROGRAMS = trashapplet
+@@ -13,4 +14,5 @@ trashapplet_SOURCES = \
+ 
+ trashapplet_LDADD = 		\
+ 	$(GNOME_APPLETS_LIBS) 	\
++	$(GNOME_LIBS2_LIBS)	\
+ 	$(GIO_LIBS)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 75b1724..17bd72c 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.1
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -64,6 +64,9 @@ Patch39:	gweather-network.patch
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
 
+# from upstream
+Patch41: 	gnome-applets-libgnomeui.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -156,6 +159,7 @@ tar xjf %{SOURCE2}
 
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
+%patch41 -p1 -b .libgnomeui
 
 intltoolize --force
 autoreconf
@@ -342,6 +346,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Dec 19 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.1-5
+- Fix the build
+
 * Thu Dec 18 2008 Jon McCann <jmccann@redhat.com> - 1:2.25.1-5
 - Rebuild for gnome-desktop
 
diff --git a/gtkbuilder-translation.patch b/gtkbuilder-translation.patch
deleted file mode 100644
index 4c53409..0000000
--- a/gtkbuilder-translation.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: po/POTFILES.in
-===================================================================
---- po/POTFILES.in	(revision 11044)
-+++ po/POTFILES.in	(working copy)
-@@ -8,7 +8,7 @@
- battstat/GNOME_BattstatApplet.server.in.in
- battstat/GNOME_BattstatApplet.xml
- battstat/battstat_applet.c
--battstat/battstat_applet.ui
-+[type: gettext/glade]battstat/battstat_applet.ui
- battstat/battstat-hal.c
- battstat/battstat.schemas.in
- battstat/properties.c
-@@ -21,7 +21,7 @@
- cpufreq/GNOME_CPUFreqApplet.server.in.in
- cpufreq/GNOME_CPUFreqApplet.xml
- cpufreq/cpufreq-applet.schemas.in
--cpufreq/cpufreq-preferences.ui
-+[type: gettext/glade]cpufreq/cpufreq-preferences.ui
- cpufreq/src/cpufreq-applet.c
- cpufreq/src/cpufreq-prefs.c
- cpufreq/src/cpufreq-monitor-cpuinfo.c
-@@ -44,7 +44,7 @@
- gswitchit/GNOME_GSwitchItApplet.xml
- gswitchit/GNOME_KeyboardApplet.server.in.in
- gswitchit/gswitchit-applet.c
--gswitchit/gswitchit.ui
-+[type: gettext/glade]gswitchit/gswitchit.ui
- gweather/GNOME_GWeatherApplet.xml
- gweather/GNOME_GWeatherApplet_Factory.server.in.in
- gweather/gweather-about.c
-@@ -54,8 +54,8 @@
- gweather/main.c
- invest-applet/data/Invest_Applet.server.in.in
- invest-applet/data/Invest_Applet.xml
--invest-applet/data/financialchart.ui
--invest-applet/data/prefs-dialog.ui
-+[type: gettext/glade]invest-applet/data/financialchart.ui
-+[type: gettext/glade]invest-applet/data/prefs-dialog.ui
- invest-applet/invest/about.py
- invest-applet/invest/applet.py
- invest-applet/invest/chart.py
-@@ -76,7 +76,7 @@
- mini-commander/src/macro.c
- mini-commander/src/mc-install-default-macros.c
- mini-commander/src/mini-commander-global.schemas.in
--mini-commander/src/mini-commander.ui
-+[type: gettext/glade]mini-commander/src/mini-commander.ui
- mini-commander/src/mini-commander.schemas.in
- mini-commander/src/mini-commander_applet.c
- mini-commander/src/preferences.c
-@@ -90,7 +90,7 @@
- modemlights/GNOME_ModemLights.server.in.in
- modemlights/GNOME_ModemLights.xml
- modemlights/modem-applet.c
--modemlights/modemlights.ui
-+[type: gettext/glade]modemlights/modemlights.ui
- multiload/GNOME_MultiLoadApplet_Factory.server.in.in
- multiload/GNOME_MultiloadApplet.xml
- multiload/linux-proc.c
-@@ -108,7 +108,7 @@
- stickynotes/GNOME_StickyNotesApplet.server.in.in
- stickynotes/GNOME_StickyNotesApplet.xml
- stickynotes/stickynotes.c
--stickynotes/stickynotes.ui
-+[type: gettext/glade]stickynotes/stickynotes.ui
- stickynotes/stickynotes.schemas.in
- stickynotes/stickynotes_applet.c
- stickynotes/stickynotes_applet_callbacks.c
diff --git a/info-leak.patch b/info-leak.patch
deleted file mode 100644
index be89737..0000000
--- a/info-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak gnome-applets-2.23.92/trashapplet/src/trashapplet.c
---- gnome-applets-2.23.92/trashapplet/src/trashapplet.c.info-leak	2008-09-16 22:38:24.000000000 -0400
-+++ gnome-applets-2.23.92/trashapplet/src/trashapplet.c	2008-09-16 22:39:29.000000000 -0400
-@@ -148,6 +148,7 @@ trash_applet_monitor_changed (TrashApple
-     }
- 
-   g_object_unref (icon);
-+  g_object_unref (info);
- }
- 
- static void
diff --git a/keyboard-applet-leak.patch b/keyboard-applet-leak.patch
deleted file mode 100644
index 804a93f..0000000
--- a/keyboard-applet-leak.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak gnome-applets-2.23.90/gswitchit/gswitchit-applet.c
---- gnome-applets-2.23.90/gswitchit/gswitchit-applet.c.keyboard-applet-leak	2008-08-29 21:29:30.000000000 -0400
-+++ gnome-applets-2.23.90/gswitchit/gswitchit-applet.c	2008-08-29 21:29:34.000000000 -0400
-@@ -151,14 +151,17 @@ GSwitchItAppletSetBackground (PanelApple
- 
- 	/* go down */
- 	if (GTK_IS_CONTAINER (w)) {
--		GList *child =
-+                GList *child;
-+		GList *children =
- 		    gtk_container_get_children (GTK_CONTAINER (w));
-+		child = children;
- 		while (child != NULL) {
- 			GSwitchItAppletSetBackground (applet,
- 						      GTK_WIDGET (child->
- 								  data));
- 			child = child->next;
- 		}
-+		g_list_free (children);
- 	}
- }
- 
diff --git a/mount-auth.patch b/mount-auth.patch
deleted file mode 100644
index 6fc9ab1..0000000
--- a/mount-auth.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth gnome-applets-2.24.0.1/drivemount/drive-button.c
---- gnome-applets-2.24.0.1/drivemount/drive-button.c.mount-auth	2008-09-26 15:37:51.000000000 -0400
-+++ gnome-applets-2.24.0.1/drivemount/drive-button.c	2008-09-26 15:39:15.000000000 -0400
-@@ -748,8 +748,10 @@ static void
- mount_drive (DriveButton *self, GtkWidget *item)
- {
-     if (self->volume) {
-+        GMountOperation *mount_op = gtk_mount_operation_new (NULL);
- 	g_volume_mount (self->volume, G_MOUNT_MOUNT_NONE,
--			NULL, NULL, NULL, NULL);
-+			mount_op, NULL, NULL, NULL);
-+        g_object_unref (mount_op);
-     } else {
- 	g_return_if_reached();
-     }
diff --git a/undecorate-mixer.patch b/undecorate-mixer.patch
deleted file mode 100644
index d503531..0000000
--- a/undecorate-mixer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer gnome-applets-2.23.4/mixer/dock.c
---- gnome-applets-2.23.4/mixer/dock.c.undecorate-mixer	2008-08-08 13:29:10.000000000 -0400
-+++ gnome-applets-2.23.4/mixer/dock.c	2008-08-08 13:29:19.000000000 -0400
-@@ -68,11 +68,16 @@ gnome_volume_applet_dock_init (GnomeVolu
-   dock->timeout = 0;
- 
-   /* We can't use a simple GDK_WINDOW_TYPE_HINT_DOCK here since
--   * the dock windows don't accept input by default. Instead we use the 
--   * popup-menu type as a base. */
-+   * the dock windows don't accept input by default. Instead we use 
-+   * the popup menu type. In the end we set everything by hand anyway
-+   * since what happens depends very heavily on the window manager. */
-   gtk_window_set_type_hint (GTK_WINDOW (dock), 
-       			    GDK_WINDOW_TYPE_HINT_POPUP_MENU);
-   gtk_window_set_keep_above (GTK_WINDOW (dock), TRUE);
-+  gtk_window_set_decorated (GTK_WINDOW (dock), FALSE);
-+  gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dock), TRUE);
-+  gtk_window_set_skip_pager_hint (GTK_WINDOW (dock), TRUE);
-+  gtk_window_set_resizable (GTK_WINDOW (dock), FALSE);
-   gtk_window_stick (GTK_WINDOW (dock));
- }
-