Error message when starting xfce4-panel

[Jasper Huijsmans]

On Tue, Nov 09, 2004 at 01:16:05PM +0100, Axel S. Gruner wrote:
> Hi Jasper!
> 
> On Tue, 09 Nov 2004, Jasper Huijsmans wrote:
> 
> > > Is there a way to stop that message poping up when starting the
> > > xfce4-panel? 
> > > 
> > > System running: FreeBSD 5.3-STABLE
> > > XFCE4: 4.0.6
> > > 
> > > Thanks in advance
> > > 
> > 
> > I thought I removed it already, but it seems like I didn't. 
> > 
> > It will be gone in Xfce 4.2, so you could try using the 4.2 BETA2 release. If
> > you want I can provide a patch for 4.0.6 to remove it.
> > 
> > 	Jasper
> 
> A patch would be nice. 
> Actually 4.0.6 is in the FreeBSD Ports, so i will use the patch till 4.2
> is out and also in the FreeBSD Ports.
> 

See attached. Hope that helps.

-------------- next part --------------
Index: panel/main.c
===================================================================
RCS file: /var/cvs/xfce/xfce4/xfce4-panel/panel/main.c,v
retrieving revision 1.32.4.4
diff -u -r1.32.4.4 main.c
--- panel/main.c	11 Jul 2004 07:59:39 -0000	1.32.4.4
+++ panel/main.c	9 Nov 2004 12:15:58 -0000
@@ -214,13 +214,10 @@
 #ifdef HAVE_SIGACTION
     struct sigaction act;
 #endif
-    gboolean net_wm_support;
     int i;
 
     progname = argv[0];
     
-    net_wm_support = FALSE;
-
 #if 0
 #ifdef ENABLE_NLS
     bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -246,21 +243,6 @@
 	return 0;
     }
 
-    for (i = 0; i < 5; i++)
-    {
-	if ((net_wm_support = check_net_wm_support ()) == TRUE)
-	    break;
-
-	g_usleep (2000 * 1000);
-    }
-
-    if (!net_wm_support)
-    {
-	xfce_err (_("Your window manager does not seem to support "
-		    "the new window manager hints as defined on "
-		    "http://www.freedesktop.org. \n"
-		    "Some XFce features may not work as intended."));
-    }
 #ifdef HAVE_SIGACTION
     act.sa_handler = sighandler;
     sigemptyset (&act.sa_mask);
Index: panel/xfce_support.c
===================================================================
RCS file: /var/cvs/xfce/xfce4/xfce4-panel/panel/xfce_support.c,v
retrieving revision 1.47.4.4
diff -u -r1.47.4.4 xfce_support.c
--- panel/xfce_support.c	11 Jul 2004 07:59:39 -0000	1.47.4.4
+++ panel/xfce_support.c	9 Nov 2004 12:15:59 -0000
@@ -284,31 +284,6 @@
     }
 }
 
-gboolean
-check_net_wm_support (void)
-{
-    static Atom xa_NET_WM_SUPPORT = 0;
-    Window xid;
-
-    if (!xa_NET_WM_SUPPORT)
-    {
-	xa_NET_WM_SUPPORT = XInternAtom (GDK_DISPLAY (),
-					 "_NET_SUPPORTING_WM_CHECK", False);
-    }
-
-    if (netk_get_window (GDK_ROOT_WINDOW (), xa_NET_WM_SUPPORT, &xid))
-    {
-/*      if (netk_get_window(xid, xa_NET_WM_SUPPORT, &xid))
-            g_print("ok");
-        else
-            g_print("not ok");
-*/
-	return TRUE;
-    }
-
-    return FALSE;
-}
-
 void
 set_window_skip (GtkWidget * win)
 {
Index: panel/xfce_support.h
===================================================================
RCS file: /var/cvs/xfce/xfce4/xfce4-panel/panel/xfce_support.h,v
retrieving revision 1.17
diff -u -r1.17 xfce_support.h
--- panel/xfce_support.h	17 May 2003 08:45:01 -0000	1.17
+++ panel/xfce_support.h	9 Nov 2004 12:15:59 -0000
@@ -37,7 +37,6 @@
 /* x atoms and properties */
 void set_window_type_dock (GtkWidget * win, gboolean set);
 void set_window_layer (GtkWidget * win, int layer);
-gboolean check_net_wm_support (void);
 void set_window_skip (GtkWidget * win);
 
 /* dnd */