[Goodies-commits] r3124 - in xfce4-wmdock-plugin/trunk: . panel-plugin

Andre Ellguth ellguth at xfce.org
Mon Sep 3 20:49:53 CEST 2007


Author: ellguth
Date: 2007-09-03 18:49:52 +0000 (Mon, 03 Sep 2007)
New Revision: 3124

Modified:
   xfce4-wmdock-plugin/trunk/ChangeLog
   xfce4-wmdock-plugin/trunk/configure
   xfce4-wmdock-plugin/trunk/configure.in
   xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c
Log:
Removed the use of function wnck_window_has_name

Modified: xfce4-wmdock-plugin/trunk/ChangeLog
===================================================================
--- xfce4-wmdock-plugin/trunk/ChangeLog	2007-09-03 18:36:37 UTC (rev 3123)
+++ xfce4-wmdock-plugin/trunk/ChangeLog	2007-09-03 18:49:52 UTC (rev 3124)
@@ -6,3 +6,6 @@
 	* Workaround added for wmnet
 	* Background tile will be shown
 	* Dockapps now centered in panel
+2007-09-03	Andre Ellguth <ellguth at ibh dot de>
+	* Removed the use of function wnck_window_has_name()
+	* Replace function XKillClient back to XDestroyWindow

Modified: xfce4-wmdock-plugin/trunk/configure
===================================================================
--- xfce4-wmdock-plugin/trunk/configure	2007-09-03 18:36:37 UTC (rev 3123)
+++ xfce4-wmdock-plugin/trunk/configure	2007-09-03 18:49:52 UTC (rev 3124)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xfce4-wmdock-plugin 0.1.5.
+# Generated by GNU Autoconf 2.61 for xfce4-wmdock-plugin 0.1.6.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
 # Identity of this package.
 PACKAGE_NAME='xfce4-wmdock-plugin'
 PACKAGE_TARNAME='xfce4-wmdock-plugin'
-PACKAGE_VERSION='0.1.5'
-PACKAGE_STRING='xfce4-wmdock-plugin 0.1.5'
+PACKAGE_VERSION='0.1.6'
+PACKAGE_STRING='xfce4-wmdock-plugin 0.1.6'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -1414,7 +1414,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xfce4-wmdock-plugin 0.1.5 to adapt to many kinds of systems.
+\`configure' configures xfce4-wmdock-plugin 0.1.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1484,7 +1484,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xfce4-wmdock-plugin 0.1.5:";;
+     short | recursive ) echo "Configuration of xfce4-wmdock-plugin 0.1.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1590,7 +1590,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xfce4-wmdock-plugin configure 0.1.5
+xfce4-wmdock-plugin configure 0.1.6
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1604,7 +1604,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xfce4-wmdock-plugin $as_me 0.1.5, which was
+It was created by xfce4-wmdock-plugin $as_me 0.1.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1959,7 +1959,7 @@
 
 
 
-WMDOCK_VERSION=0.1.5
+WMDOCK_VERSION=0.1.6
 am__api_version="1.9"
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -20923,7 +20923,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xfce4-wmdock-plugin $as_me 0.1.5, which was
+This file was extended by xfce4-wmdock-plugin $as_me 0.1.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20976,7 +20976,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xfce4-wmdock-plugin config.status 0.1.5
+xfce4-wmdock-plugin config.status 0.1.6
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: xfce4-wmdock-plugin/trunk/configure.in
===================================================================
--- xfce4-wmdock-plugin/trunk/configure.in	2007-09-03 18:36:37 UTC (rev 3123)
+++ xfce4-wmdock-plugin/trunk/configure.in	2007-09-03 18:49:52 UTC (rev 3124)
@@ -5,7 +5,7 @@
 dnl
 
 dnl version info
-m4_define([wmdock_version], [0.1.5])
+m4_define([wmdock_version], [0.1.6])
 
 dnl init autoconf
 AC_INIT([xfce4-wmdock-plugin], [wmdock_version])

Modified: xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c
===================================================================
--- xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c	2007-09-03 18:36:37 UTC (rev 3123)
+++ xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c	2007-09-03 18:49:52 UTC (rev 3124)
@@ -1,8 +1,12 @@
-/* $Id: wmdock.c,v 1.3 2007/09/01 15:40:24 ellguth Exp ellguth $
+/* $Id: wmdock.c,v 1.4 2007/09/03 18:36:52 ellguth Exp ellguth $
  *
  * wmdock xfce4 plugin by Andre Ellguth
  *
  * $Log: wmdock.c,v $
+ * Revision 1.4  2007/09/03 18:36:52  ellguth
+ * Removed the use of function wnck_window_has_name().
+ * Replace function XKillClient back to XDestroyWindow.
+ *
  * Revision 1.3  2007/09/01 15:40:24  ellguth
  * Plugin don't crash anymore if you change the orientation of the panel.
  * Workaround added for wmnet.
@@ -60,6 +64,7 @@
 	unsigned long int naft;
 	gboolean ret=FALSE;
 	unsigned char *dat;
+	char *wname = NULL;
 	
 	gdk_error_trap_push();
 	if (XGetWindowProperty(
@@ -74,8 +79,9 @@
 	XSync(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),False);
 	
 	/* Workaround for the dockapp wmnet */
-	if(wnck_window_has_name(w)) {
-		if(!g_strcasecmp(wnck_window_get_name(w), "wmnet")) ret = TRUE;
+	wname = (char *) wnck_window_get_name(w);
+	if(wname) {
+		if(!g_strcasecmp(wname, "wmnet")) ret = TRUE;
 	}
 	
 	gdk_error_trap_pop();
@@ -85,8 +91,10 @@
 
 void wmdock_destroy_dockapp(DockappNode *dapp)
 {
-	//XDestroyWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);XDestroyWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);
-	XKillClient(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);
+	XDestroyWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);XDestroyWindow(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);
+	/*
+		XKillClient(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), dapp->i);
+	*/
 }
 
 




More information about the Goodies-commits mailing list