gnome-control-center

Merge lp:~speijnik/gnome-control-center/bug-559106 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

  1. bug-559106
  2. Merge into ubuntu
Proposed by Stephan Peijnik
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~speijnik/gnome-control-center/bug-559106
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 139 lines (+28/-26)
1 file modified
debian/patches/95_desktop-effects-integration.patch (+28/-26)
To merge this branch: bzr merge lp:~speijnik/gnome-control-center/bug-559106
Reviewer Review Type Date Requested Status
Sebastien Bacher Disapprove
Review via email: mp+23086@code.launchpad.net

Description of the change

Fix for LP:559106. Now checking for existence of /usr/share/doc/compiz and /usr/share/doc/compiz-gnome before enabling visual effects tab.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

The fix is wrong as explained in the bug report, if compiz is installed in the path it should be able to run otherwise the compiz packaging is buggy

review: Disapprove

Unmerged revisions

169. By Stephan Peijnik

Added additional checks for disabling visual effects tab in Appearance Properties (checking for existence of /usr/share/doc/compiz and /usr/share/doc/compiz-gnome now, which will exist if both compiz and compiz-gnome are installed).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/95_desktop-effects-integration.patch'
2--- debian/patches/95_desktop-effects-integration.patch 2010-02-23 03:05:32 +0000
3+++ debian/patches/95_desktop-effects-integration.patch 2010-04-09 11:20:30 +0000
4@@ -1,7 +1,7 @@
5-Index: gnome-control-center-2.29.90/capplets/appearance/appearance-effects.c
6+Index: gnome-control-center-2.30.0/capplets/appearance/appearance-effects.c
7 ===================================================================
8 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
9-+++ gnome-control-center-2.29.90/capplets/appearance/appearance-effects.c 2010-02-23 02:45:24.082445648 +0000
10++++ gnome-control-center-2.30.0/capplets/appearance/appearance-effects.c 2010-04-09 13:01:21.548107913 +0200
11 @@ -0,0 +1,1089 @@
12 +/*
13 + * Copyright (C) 2007 Canonical
14@@ -1092,10 +1092,10 @@
15 + gtk_widget_hide (hbox_custom_effects);
16 +}
17 +
18-Index: gnome-control-center-2.29.90/capplets/appearance/appearance-effects.h
19+Index: gnome-control-center-2.30.0/capplets/appearance/appearance-effects.h
20 ===================================================================
21 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
22-+++ gnome-control-center-2.29.90/capplets/appearance/appearance-effects.h 2010-02-23 02:45:24.082445648 +0000
23++++ gnome-control-center-2.30.0/capplets/appearance/appearance-effects.h 2010-04-09 13:01:21.548107913 +0200
24 @@ -0,0 +1,22 @@
25 +/*
26 + * Copyright (C) 2007 Canonical
27@@ -1119,13 +1119,13 @@
28 +
29 +void effects_init (AppearanceData *data);
30 +gchar* get_current_window_manager (void);
31-Index: gnome-control-center-2.29.90/capplets/appearance/appearance.h
32+Index: gnome-control-center-2.30.0/capplets/appearance/appearance.h
33 ===================================================================
34---- gnome-control-center-2.29.90.orig/capplets/appearance/appearance.h 2010-02-23 02:45:01.412442341 +0000
35-+++ gnome-control-center-2.29.90/capplets/appearance/appearance.h 2010-02-23 02:45:24.082445648 +0000
36-@@ -79,6 +79,12 @@
37- gchar *revert_windowtitle_font;
38+--- gnome-control-center-2.30.0.orig/capplets/appearance/appearance.h 2010-04-09 13:01:21.400120312 +0200
39++++ gnome-control-center-2.30.0/capplets/appearance/appearance.h 2010-04-09 13:01:21.552107932 +0200
40+@@ -81,6 +81,12 @@
41 gchar *revert_monospace_font;
42+ gchar *revert_button_layout;
43
44 + /* effects */
45 + gboolean compiz_running;
46@@ -1136,10 +1136,10 @@
47 /* style */
48 GdkPixbuf *gtk_theme_icon;
49 GdkPixbuf *window_theme_icon;
50-Index: gnome-control-center-2.29.90/capplets/appearance/appearance-main.c
51+Index: gnome-control-center-2.30.0/capplets/appearance/appearance-main.c
52 ===================================================================
53---- gnome-control-center-2.29.90.orig/capplets/appearance/appearance-main.c 2010-02-23 02:45:01.442443569 +0000
54-+++ gnome-control-center-2.29.90/capplets/appearance/appearance-main.c 2010-02-23 02:47:47.124969629 +0000
55+--- gnome-control-center-2.30.0.orig/capplets/appearance/appearance-main.c 2010-03-29 16:22:56.000000000 +0200
56++++ gnome-control-center-2.30.0/capplets/appearance/appearance-main.c 2010-04-09 13:03:23.432282611 +0200
57 @@ -21,6 +21,7 @@
58 #include <glib/gi18n.h>
59 #include "appearance.h"
60@@ -1148,7 +1148,7 @@
61 #include "appearance-font.h"
62 #include "appearance-themes.h"
63 #include "appearance-style.h"
64-@@ -114,11 +115,19 @@
65+@@ -116,11 +117,19 @@
66 }
67 }
68
69@@ -1168,7 +1168,7 @@
70
71 gchar *install_filename = NULL;
72 gchar *start_page = NULL;
73-@@ -164,6 +173,7 @@
74+@@ -166,6 +175,7 @@
75 desktop_init (data, (const gchar **) wallpaper_files);
76 g_strfreev (wallpaper_files);
77 font_init (data);
78@@ -1176,13 +1176,15 @@
79
80 /* prepare the main window */
81 w = appearance_capplet_get_widget (data, "appearance_window");
82-@@ -205,6 +215,34 @@
83+@@ -207,6 +217,36 @@
84
85 g_option_context_free (option_context);
86
87 + warning = appearance_capplet_get_widget (data, "no_compiz_box");
88 +
89-+ if (g_find_program_in_path ("compiz") == NULL) {
90++ if ((g_find_program_in_path ("compiz") == NULL)
91++ || (g_access ("/usr/share/doc/compiz") < 0)
92++ || (g_access ("/usr/share/doc/compiz-gnome") < 0)) {
93 + GtkWidget *box;
94 +
95 + box = appearance_capplet_get_widget (data, "effects_vbox");
96@@ -1210,11 +1212,11 @@
97 +
98 /* start the mainloop */
99 gtk_main ();
100-
101-Index: gnome-control-center-2.29.90/capplets/appearance/data/appearance.ui
102+ gdk_threads_leave ();
103+Index: gnome-control-center-2.30.0/capplets/appearance/data/appearance.ui
104 ===================================================================
105---- gnome-control-center-2.29.90.orig/capplets/appearance/data/appearance.ui 2010-02-23 02:45:01.382443277 +0000
106-+++ gnome-control-center-2.29.90/capplets/appearance/data/appearance.ui 2010-02-23 02:45:24.092453554 +0000
107+--- gnome-control-center-2.30.0.orig/capplets/appearance/data/appearance.ui 2010-03-04 14:49:28.000000000 +0100
108++++ gnome-control-center-2.30.0/capplets/appearance/data/appearance.ui 2010-04-09 13:01:21.560108809 +0200
109 @@ -1549,6 +1549,342 @@
110 <property name="tab_fill">False</property>
111 </packing>
112@@ -1558,10 +1560,10 @@
113 </object>
114 <packing>
115 <property name="position">1</property>
116-Index: gnome-control-center-2.29.90/capplets/appearance/Makefile.am
117+Index: gnome-control-center-2.30.0/capplets/appearance/Makefile.am
118 ===================================================================
119---- gnome-control-center-2.29.90.orig/capplets/appearance/Makefile.am 2010-02-23 02:45:01.402442467 +0000
120-+++ gnome-control-center-2.29.90/capplets/appearance/Makefile.am 2010-02-23 02:45:24.092453554 +0000
121+--- gnome-control-center-2.30.0.orig/capplets/appearance/Makefile.am 2010-01-26 09:46:31.000000000 +0100
122++++ gnome-control-center-2.30.0/capplets/appearance/Makefile.am 2010-04-09 13:01:21.564108130 +0200
123 @@ -9,6 +9,8 @@
124 appearance.h \
125 appearance-desktop.c \
126@@ -1571,10 +1573,10 @@
127 appearance-font.c \
128 appearance-font.h \
129 appearance-main.c \
130-Index: gnome-control-center-2.29.90/po/POTFILES.in
131+Index: gnome-control-center-2.30.0/po/POTFILES.in
132 ===================================================================
133---- gnome-control-center-2.29.90.orig/po/POTFILES.in 2010-02-23 02:45:01.462452955 +0000
134-+++ gnome-control-center-2.29.90/po/POTFILES.in 2010-02-23 02:45:24.092453554 +0000
135+--- gnome-control-center-2.30.0.orig/po/POTFILES.in 2009-08-24 12:54:41.000000000 +0200
136++++ gnome-control-center-2.30.0/po/POTFILES.in 2010-04-09 13:01:21.564108130 +0200
137 @@ -16,6 +16,7 @@
138 capplets/accessibility/at-properties/at-properties.desktop.in.in
139 capplets/accessibility/at-properties/main.c

Subscribers

People subscribed via source and target branches