diff -Nru gnome-control-center-2.25.3/debian/changelog gnome-control-center-2.25.3/debian/changelog --- gnome-control-center-2.25.3/debian/changelog 2009-02-10 13:35:54.000000000 +0000 +++ gnome-control-center-2.25.3/debian/changelog 2009-02-10 13:35:55.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-control-center (1:2.25.3-0ubuntu5) jaunty; urgency=low + + * debian/patches/95_desktop-effects-integration.patch: + - show warning at top of the desktop effects tab if compiz is not + installed (lp: #327465) + + -- Bruce Cowan Tue, 10 Feb 2009 12:47:08 +0000 + gnome-control-center (1:2.25.3-0ubuntu4) jaunty; urgency=low * debian/patches/96_build_sound_capplet.patch: diff -Nru gnome-control-center-2.25.3/debian/patches/95_desktop-effects-integration.patch gnome-control-center-2.25.3/debian/patches/95_desktop-effects-integration.patch --- gnome-control-center-2.25.3/debian/patches/95_desktop-effects-integration.patch 2009-02-10 13:35:54.000000000 +0000 +++ gnome-control-center-2.25.3/debian/patches/95_desktop-effects-integration.patch 2009-02-10 13:35:55.000000000 +0000 @@ -1,6 +1,6 @@ -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.c gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.c ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.c 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.c 2008-10-13 15:32:26.000000000 +0100 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/appearance-effects.c gnome-control-center-2.25.3.new/capplets/appearance/appearance-effects.c +--- gnome-control-center-2.25.3/capplets/appearance/appearance-effects.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-control-center-2.25.3.new/capplets/appearance/appearance-effects.c 2009-02-10 12:39:07.000000000 +0000 @@ -0,0 +1,1120 @@ +/* + * Copyright (C) 2007 Canonical @@ -1122,9 +1122,9 @@ + gtk_widget_hide (hbox_custom_effects); +} + -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.h gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.h ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-effects.h 1970-01-01 01:00:00.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-effects.h 2008-10-13 15:32:26.000000000 +0100 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/appearance-effects.h gnome-control-center-2.25.3.new/capplets/appearance/appearance-effects.h +--- gnome-control-center-2.25.3/capplets/appearance/appearance-effects.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-control-center-2.25.3.new/capplets/appearance/appearance-effects.h 2009-02-10 12:39:07.000000000 +0000 @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2007 Canonical @@ -1147,9 +1147,9 @@ + */ + +void effects_init (AppearanceData *data); -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance.h gnome-control-center-2.24.0.1.new/capplets/appearance/appearance.h ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance.h 2008-10-13 15:32:23.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance.h 2008-10-13 15:32:26.000000000 +0100 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/appearance.h gnome-control-center-2.25.3.new/capplets/appearance/appearance.h +--- gnome-control-center-2.25.3/capplets/appearance/appearance.h 2009-02-10 12:39:01.000000000 +0000 ++++ gnome-control-center-2.25.3.new/capplets/appearance/appearance.h 2009-02-10 12:39:07.000000000 +0000 @@ -70,6 +70,12 @@ gchar *revert_windowtitle_font; gchar *revert_monospace_font; @@ -1163,10 +1163,10 @@ /* style */ GdkPixbuf *gtk_theme_icon; GdkPixbuf *window_theme_icon; -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-main.c ---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c 2008-10-13 15:32:23.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/appearance-main.c 2008-10-13 15:36:59.000000000 +0100 -@@ -156,6 +156,7 @@ +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/appearance-main.c gnome-control-center-2.25.3.new/capplets/appearance/appearance-main.c +--- gnome-control-center-2.25.3/capplets/appearance/appearance-main.c 2009-02-10 12:39:01.000000000 +0000 ++++ gnome-control-center-2.25.3.new/capplets/appearance/appearance-main.c 2009-02-10 12:46:24.000000000 +0000 +@@ -163,6 +163,7 @@ g_strfreev (wallpaper_files); font_init (data); ui_init (data); @@ -1174,25 +1174,31 @@ /* prepare the main window */ w = glade_xml_get_widget (data->xml, "appearance_window"); -@@ -188,6 +189,14 @@ - g_free (page_name); - } +@@ -197,6 +198,20 @@ + + g_option_context_free (option_context); -+ /* de-sensitise effects tab if compiz isn't installed */ + if (g_find_program_in_path ("compiz") == NULL) { -+ GtkWidget *w; ++ GtkWidget *box; ++ GtkWidget *warning; + -+ w = glade_xml_get_widget (data->xml, "effects_vbox"); -+ gtk_widget_set_sensitive (w, FALSE); ++ /* de-sensitise effects tab if compiz isn't installed */ ++ box = glade_xml_get_widget (data->xml, "effects_vbox"); ++ gtk_widget_set_sensitive (box, FALSE); ++ ++ /* show warning if compiz isn't installed */ ++ warning = glade_xml_get_widget (data->xml, "no_compiz_box"); ++ gtk_widget_set_sensitive (warning, TRUE); ++ gtk_widget_show_all (warning); + } + /* start the mainloop */ gtk_main (); -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/data/appearance.glade gnome-control-center-2.24.0.1.new/capplets/appearance/data/appearance.glade ---- gnome-control-center-2.24.0.1/capplets/appearance/data/appearance.glade 2008-10-13 15:32:23.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/data/appearance.glade 2008-10-13 15:32:26.000000000 +0100 -@@ -1815,6 +1815,281 @@ +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/data/appearance.glade gnome-control-center-2.25.3.new/capplets/appearance/data/appearance.glade +--- gnome-control-center-2.25.3/capplets/appearance/data/appearance.glade 2009-02-10 12:39:01.000000000 +0000 ++++ gnome-control-center-2.25.3.new/capplets/appearance/data/appearance.glade 2009-02-10 12:41:04.000000000 +0000 +@@ -1815,6 +1815,321 @@ False @@ -1204,6 +1210,46 @@ + 18 + True + ++ ++ 26 ++ False ++ ++ ++ True ++ 6 ++ ++ ++ False ++ 0 ++ gtk-dialog-warning ++ 6 ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ 0 ++ 6 ++ <b>Compiz is not installed</b> ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ + + True + True @@ -1474,9 +1520,9 @@ 1 -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/capplets/appearance/Makefile.am gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.am ---- gnome-control-center-2.24.0.1/capplets/appearance/Makefile.am 2008-10-13 15:32:23.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/capplets/appearance/Makefile.am 2008-10-13 15:32:26.000000000 +0100 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/capplets/appearance/Makefile.am gnome-control-center-2.25.3.new/capplets/appearance/Makefile.am +--- gnome-control-center-2.25.3/capplets/appearance/Makefile.am 2009-02-10 12:39:01.000000000 +0000 ++++ gnome-control-center-2.25.3.new/capplets/appearance/Makefile.am 2009-02-10 12:39:07.000000000 +0000 @@ -9,6 +9,8 @@ appearance.h \ appearance-desktop.c \ @@ -1486,10 +1532,10 @@ appearance-font.c \ appearance-font.h \ appearance-main.c \ -diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.24.0.1/po/POTFILES.in gnome-control-center-2.24.0.1.new/po/POTFILES.in ---- gnome-control-center-2.24.0.1/po/POTFILES.in 2008-10-13 15:32:23.000000000 +0100 -+++ gnome-control-center-2.24.0.1.new/po/POTFILES.in 2008-10-13 15:32:26.000000000 +0100 -@@ -11,6 +11,7 @@ +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.25.3/po/POTFILES.in gnome-control-center-2.25.3.new/po/POTFILES.in +--- gnome-control-center-2.25.3/po/POTFILES.in 2009-02-10 12:39:01.000000000 +0000 ++++ gnome-control-center-2.25.3.new/po/POTFILES.in 2009-02-10 12:39:07.000000000 +0000 +@@ -14,6 +14,7 @@ capplets/accessibility/at-properties/at-properties.desktop.in.in capplets/accessibility/at-properties/main.c capplets/appearance/appearance-desktop.c