[Goodies-commits] r6492 - xfce4-wmdock-plugin/trunk/panel-plugin

[Andre Ellguth]

Author: ellguth
Date: 2009-01-18 12:59:56 +0000 (Sun, 18 Jan 2009)
New Revision: 6492

Modified:
   xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c
   xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.h
Log:
Added the GPL license text in the source code.
Als dockapps listed in the wmdockrc will be append at the startup time.


Modified: xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c
===================================================================
--- xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c	2009-01-18 12:39:29 UTC (rev 6491)
+++ xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.c	2009-01-18 12:59:56 UTC (rev 6492)
@@ -1,7 +1,24 @@
-/* $Id$
+/* wmdock xfce4 plugin by Andre Ellguth
  *
- * wmdock xfce4 plugin by Andre Ellguth
+ * $Id$
  *
+ * Authors:
+ *   Andre Ellguth <ellguth at ibh.de>
+ *
+ * License:
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this package; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include <stdio.h>
@@ -437,14 +454,15 @@
   fflush(fp);
 #endif
 
+  cmd = wmdock_get_dockapp_cmd(w);
+
   if(wmdock->propDispAddOnlyWM == TRUE && 
-     g_str_has_prefix (wnck_window_get_name(w), "wm") == FALSE) {
+     g_str_has_prefix (wnck_window_get_name(w), "wm") == FALSE && 
+        ! (wmdock_find_startup_dockapp(cmd))) {
    XFree(h);
    return;
   }
 
-  cmd = wmdock_get_dockapp_cmd(w);
-
   if(!cmd) {
    XFree(h);
    return;
@@ -525,6 +543,7 @@
    dapp->tile = wmdock_create_tile_from_socket(dapp);
 
    gtk_box_pack_start(GTK_BOX(wmdock->box), dapp->tile, FALSE, FALSE, 0);
+
   }
 
   gtk_socket_add_id(dapp->s, dapp->i);
@@ -1092,10 +1111,11 @@
 
  gtk_box_pack_start(GTK_BOX(wmdock->panelBox), GTK_WIDGET(wmdock->box), 
 		    FALSE, FALSE, 0);
+
  gtk_widget_show(GTK_WIDGET(wmdock->box));
 
  gtk_container_add (GTK_CONTAINER (wmdock->align), wmdock->panelBox);
-	
+ 
  return wmdock;
 }
 

Modified: xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.h
===================================================================
--- xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.h	2009-01-18 12:39:29 UTC (rev 6491)
+++ xfce4-wmdock-plugin/trunk/panel-plugin/wmdock.h	2009-01-18 12:59:56 UTC (rev 6492)
@@ -1,3 +1,26 @@
+/* wmdock xfce4 plugin by Andre Ellguth
+ *
+ * $Id$
+ *
+ * Authors:
+ *   Andre Ellguth <ellguth at ibh.de>
+ *
+ * License:
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this package; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
 #ifndef __WMDOCK_H__
 #define __WMDOCK_H__