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

Proposed by Ignace Mouzannar on 2010-05-04
Status: Merged
Merged at revision: 36
Proposed branch: lp:~ghantoos/alltray/old-maintenance-corrected-compiz
Merge into: lp:alltray/old-maintenance
Diff against target: 100 lines (+22/-5)
4 files modified
alltray.1 (+1/-1)
src/clickmode.c (+1/-1)
src/common.h (+1/-0)
src/main.c (+19/-3)
To merge this branch: bzr merge lp:~ghantoos/alltray/old-maintenance-corrected-compiz
Reviewer Review Type Date Requested Status
Michael B. Trausch 2010-05-04 Approve on 2010-05-04
Review via email: mp+24659@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Michael B. Trausch (mtrausch) wrote :

Approved, will merge shortly.

review: Approve
Ignace Mouzannar (ghantoos) wrote :

Great. Thanks! :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'alltray.1'
2--- alltray.1 2010-02-09 04:28:14 +0000
3+++ alltray.1 2010-05-04 11:46:21 +0000
4@@ -78,7 +78,7 @@
5 Add entry "menu text:command" to popdown menu\&.
6 .TP
7 \fB\-t\fR \fB\-\-title\fR
8-Show title change for <sec> seconds. Probably most usefull for xmms\&.
9+Show title change for <sec> seconds. Probably most useful for xmms\&.
10 .TP
11 \fB\-g\fR \fB\-\-geometry\fR
12 initial position. see man X.
13
14=== modified file 'src/clickmode.c'
15--- src/clickmode.c 2008-12-28 20:43:51 +0000
16+++ src/clickmode.c 2010-05-04 11:46:21 +0000
17@@ -141,7 +141,7 @@
18
19 target_win != None &&
20 target_win != GDK_ROOT_WINDOW() &&
21- target_win != target_win_xmu &&
22+ (target_win != target_win_xmu || win->compiz == TRUE) &&
23 window_type_is_normal (target_win_xmu))) {
24
25 gdk_pointer_ungrab (GDK_CURRENT_TIME);
26
27=== modified file 'src/common.h'
28--- src/common.h 2008-12-28 20:43:52 +0000
29+++ src/common.h 2010-05-04 11:46:21 +0000
30@@ -186,6 +186,7 @@
31
32 gchar *window_manager;
33 gboolean gnome;
34+ gboolean compiz;
35 gboolean kde;
36
37 gboolean no_reparent;
38
39=== modified file 'src/main.c'
40--- src/main.c 2010-02-07 21:33:20 +0000
41+++ src/main.c 2010-05-04 11:46:21 +0000
42@@ -123,6 +123,7 @@
43
44 win->window_manager=NULL;
45 win->gnome=FALSE;
46+ win->compiz=FALSE;
47 win->kde=FALSE;
48
49 win->no_reparent=FALSE;
50@@ -169,7 +170,7 @@
51
52 if (debug) printf ("window manager: %s\n", win->window_manager);
53
54- if (!strcmp(win->window_manager, "Metacity")) {
55+ if ((!strcmp(win->window_manager, "Metacity"))) {
56
57 #ifndef GCONF_NOT_DISABLED
58 printf ("\n\nAlltray: To use Alltray under Gnome, Gconf support should not be disabled.\n"
59@@ -181,6 +182,16 @@
60 win->no_reparent=TRUE;
61 }
62
63+ if (!strcmp(win->window_manager, "compiz")) {
64+ #ifndef GCONF_NOT_DISABLED
65+ printf ("\n\nAlltray: To use Alltray with Compiz, Gconf support should not be disabled.\n"
66+ " But it is.\n\n");
67+ exit (0);
68+ #endif
69+
70+ win->compiz = TRUE;
71+ }
72+
73 if (!strcmp(win->window_manager, "KWin")) {
74 win->kde=TRUE;
75 win->no_reparent=TRUE;
76@@ -237,6 +248,7 @@
77
78 win->gnome=FALSE;
79 win->kde=FALSE;
80+ win->compiz=FALSE;
81 win->no_reparent=TRUE;
82 }
83
84@@ -363,10 +375,14 @@
85 if (!win->click_mode && !win->notray)
86 wait_for_manager(win);
87
88- if (!win->click_mode)
89+ if (!win->click_mode) {
90 exec_and_wait_for_window(win);
91- else
92+ } else {
93+ if(win->compiz) {
94+ win->no_reparent = TRUE;
95+ }
96 click_mode(win);
97+ }
98
99 if (win->xmms) {
100 win->xmms_main_window_gdk=gdk_window_foreign_new(win->xmms_main_window_xlib);

Subscribers

People subscribed via source and target branches