Merge lp:~ghantoos/alltray/old-maintenance-corrected-compiz into lp:alltray/old-maintenance

[Ignace Mouzannar]

Hello Mike,

This branch corrects a minor typo in the manpage, and applies the patch that was included in Ubuntu fixing the bug preventing users from hiding open windows when using compiz.

Cheers,
 Ignace M

PS: the branch is still in "updating" mode on its LP page. I don't know why it is taking so long for LP to scan the changes.

[Michael B. Trausch (mtrausch)]

Approved, will merge shortly.

review: Approve

[Ignace Mouzannar (ghantoos)]

Great. Thanks! :)

=== modified file 'alltray.1'
--- alltray.1	2010-02-09 04:28:14 +0000
+++ alltray.1	2010-05-04 11:46:21 +0000
@@ -78,7 +78,7 @@
 Add entry "menu text:command" to popdown menu\&.
 .TP
 \fB\-t\fR \fB\-\-title\fR
-Show title change for <sec> seconds. Probably most usefull for xmms\&.
+Show title change for <sec> seconds. Probably most useful for xmms\&.
 .TP
 \fB\-g\fR \fB\-\-geometry\fR
 initial position. see man X.
 
=== modified file 'src/clickmode.c'
--- src/clickmode.c	2008-12-28 20:43:51 +0000
+++ src/clickmode.c	2010-05-04 11:46:21 +0000
@@ -141,7 +141,7 @@
 
              target_win != None &&
              target_win != GDK_ROOT_WINDOW() &&
-             target_win != target_win_xmu &&
+             (target_win != target_win_xmu  || win->compiz == TRUE) &&
              window_type_is_normal (target_win_xmu))) {
 
               gdk_pointer_ungrab  (GDK_CURRENT_TIME); 
 
=== modified file 'src/common.h'
--- src/common.h	2008-12-28 20:43:52 +0000
+++ src/common.h	2010-05-04 11:46:21 +0000
@@ -186,6 +186,7 @@
 
   gchar *window_manager;
   gboolean gnome;
+  gboolean compiz;
   gboolean kde;
 
   gboolean no_reparent;
 
=== modified file 'src/main.c'
--- src/main.c	2010-02-07 21:33:20 +0000
+++ src/main.c	2010-05-04 11:46:21 +0000
@@ -123,6 +123,7 @@
 
   win->window_manager=NULL;
   win->gnome=FALSE;
+  win->compiz=FALSE;
   win->kde=FALSE;
 
   win->no_reparent=FALSE;
@@ -169,7 +170,7 @@
 
   if (debug) printf ("window manager: %s\n", win->window_manager);
 
-  if (!strcmp(win->window_manager, "Metacity")) {
+  if ((!strcmp(win->window_manager, "Metacity"))) {
 
     #ifndef GCONF_NOT_DISABLED
           printf ("\n\nAlltray: To use Alltray under Gnome, Gconf support should not be disabled.\n"
@@ -181,6 +182,16 @@
     win->no_reparent=TRUE;
   }
 
+  if (!strcmp(win->window_manager, "compiz")) {
+    #ifndef GCONF_NOT_DISABLED
+          printf ("\n\nAlltray: To use Alltray with Compiz, Gconf support should not be disabled.\n"
+                  "         But it is.\n\n");
+          exit (0);
+    #endif 
+
+     win->compiz = TRUE;
+  }
+
   if (!strcmp(win->window_manager, "KWin")) {
      win->kde=TRUE;
      win->no_reparent=TRUE;
@@ -237,6 +248,7 @@
 
     win->gnome=FALSE;
     win->kde=FALSE;
+    win->compiz=FALSE;
     win->no_reparent=TRUE;
   }
 
@@ -363,10 +375,14 @@
   if (!win->click_mode && !win->notray)
     wait_for_manager(win);
 
-  if (!win->click_mode)
+  if (!win->click_mode) {
     exec_and_wait_for_window(win);
-  else
+  } else {
+    if(win->compiz) {
+      win->no_reparent = TRUE;
+    }
     click_mode(win);
+  }
 
   if (win->xmms) {
     win->xmms_main_window_gdk=gdk_window_foreign_new(win->xmms_main_window_xlib);