Updating branch refs/heads/master
to 3012db5d8421b7fc95b16d17062ed11996d053cd (commit)
from cf8c5aded86146c98266e04db982933ff9dd6373 (commit)
commit 3012db5d8421b7fc95b16d17062ed11996d053cd
Author: Andre Ellguth <an...@ellguth.com>
Date: Sun Oct 20 21:50:16 2013 +0200
Added an additional detection of dockapps.
panel-plugin/catchwindow.c | 5 ++++-
panel-plugin/dockapp.c | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/catchwindow.c b/panel-plugin/catchwindow.c
index 2a40200..99da57f 100644
--- a/panel-plugin/catchwindow.c
+++ b/panel-plugin/catchwindow.c
@@ -106,6 +106,7 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
XWindowAttributes attr;
DockappNode *dapp = NULL;
gchar *cmd = NULL;
+ const char *wmclass = NULL;
gboolean rcDapp = FALSE;
gdk_error_trap_push();
@@ -116,10 +117,12 @@ void wmdock_window_open(WnckScreen *s, WnckWindow *w)
if(!h)
return;
+ wmclass = wnck_window_get_class_group(w) ?
wnck_class_group_get_name(wnck_window_get_class_group(w)) : NULL;
if(h->initial_state == WithdrawnState ||
h->flags == (WindowGroupHint | StateHint |
IconWindowHint) ||
- has_dockapp_hint(w) == TRUE) {
+ has_dockapp_hint(w) == TRUE ||
+ (wmclass && !g_strcmp0(wmclass, "DockApp"))) {
debug("catchwindow.c: new wmapp open");
debug("catchwindow.c: New dockapp %s with xid: 0x%x pid: %u
arrived sessid: %s",
diff --git a/panel-plugin/dockapp.c b/panel-plugin/dockapp.c
index 230e7e6..5045f3b 100644
--- a/panel-plugin/dockapp.c
+++ b/panel-plugin/dockapp.c
@@ -709,7 +709,7 @@ void wmdock_redraw_dockapp(DockappNode *dapp)
gtk_widget_unmap (GTK_WIDGET(dapp->s));
wmdock_set_tile_background(dapp, gdkPbTileDefault);
- debug("dockapp.c: Dockapp %s redrawed with tile %d", dapp->name,
wmdock->propDispTile);
+ debug("dockapp.c: Dockapp %s redrawed with tile %s.", dapp->name,
wmdock->propDispTile ? "enabled" : "disabled");
if(dapp->bg)
gdk_window_process_updates(dapp->bg->window, FALSE);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
