rpms/control-center/devel control-center.spec, 1.487, 1.488 make-default.patch, 1.12, 1.13 no-tweaks.patch, 1.4, 1.5
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 23 22:16:30 UTC 2009
- Previous message (by thread): rpms/nautilus/devel nautilus-2.28.0-revert-bg-fade-break.patch, NONE, 1.1 nautilus.spec, 1.288, 1.289
- Next message (by thread): rpms/GConf2/devel .cvsignore, 1.44, 1.45 GConf2.spec, 1.112, 1.113 sources, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12131
Modified Files:
control-center.spec make-default.patch no-tweaks.patch
Log Message:
update patches
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -p -r1.487 -r1.488
--- control-center.spec 22 Sep 2009 05:48:16 -0000 1.487
+++ control-center.spec 23 Sep 2009 22:16:29 -0000 1.488
@@ -56,9 +56,6 @@ Patch46: no-tweaks.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=590349
Patch47: save-as.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=591375
-Patch50: slideshow-ui.patch
-
# call the Fedora/RHEL graphical passwd changing apps
Patch95: gnome-control-center-2.25.2-passwd.patch
Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -194,7 +191,6 @@ for the GNOME desktop.
%patch33 -p1 -b .notification-theme
%patch46 -p1 -b .no-tweaks
%patch47 -p1 -b .save-as
-%patch50 -p1 -b .slideshow-ui
# vendor configuration patches
%patch95 -p1 -b .passwd
make-default.patch:
appearance-desktop.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 116 insertions(+)
Index: make-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- make-default.patch 14 Aug 2009 12:58:15 -0000 1.12
+++ make-default.patch 23 Sep 2009 22:16:29 -0000 1.13
@@ -1,26 +1,6 @@
-From e47d2eefeea93a34848ee67ea0794d1fc88fe89f Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Fri, 14 Aug 2009 12:49:52 +0100
-Subject: [PATCH] =?utf-8?q?Bug=20536531=20=E2=80=93=20Allow=20setting=20the=20default=20background?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-The new gdm uses the system-wide default background for the login
-screen. This patch allows configuring this using the normal
-configuration tool for the desktop background.
-
-Add a "Make default" button to the background tab of the appearance
-capplet. It depends on the gconf-defaults service and uses
-PolicyKit for access control.
----
- capplets/appearance/appearance-desktop.c | 116 ++++++++++++++++++++++++++++++
- 1 files changed, 116 insertions(+), 0 deletions(-)
-
-diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
-index bf2f5a1..a5ff367 100644
---- a/capplets/appearance/appearance-desktop.c
-+++ b/capplets/appearance/appearance-desktop.c
+diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c.make-default 2009-09-21 06:44:55.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c 2009-09-23 18:13:49.115396173 -0400
@@ -31,6 +31,8 @@
#include <libgnomeui/gnome-desktop-thumbnail.h>
#include <libgnomeui/gnome-bg.h>
@@ -30,7 +10,7 @@ index bf2f5a1..a5ff367 100644
enum {
TARGET_URI_LIST,
TARGET_BGIMAGE
-@@ -991,12 +993,108 @@ wp_select_after_realize (GtkWidget *widget,
+@@ -984,6 +986,100 @@ wp_select_after_realize (GtkWidget *widg
select_item (data, item, TRUE);
}
@@ -115,7 +95,7 @@ index bf2f5a1..a5ff367 100644
+ &error,
+ G_TYPE_STRV, background_keys,
+ G_TYPE_INVALID,
-+ G_TYPE_UINT, &result,
++ G_TYPE_UINT, &result,
+ G_TYPE_INVALID)) {
+ g_warning ("error calling CanSetSystem: %s\n", error->message);
+ g_error_free (error);
@@ -128,18 +108,19 @@ index bf2f5a1..a5ff367 100644
+ gtk_action_set_visible (action, result != 0);
+}
+
- void
- desktop_init (AppearanceData *data,
- const gchar **uris)
+ static GdkPixbuf *buttons[3];
+
+ static void
+@@ -1146,6 +1242,8 @@ desktop_init (AppearanceData *data,
{
- GtkWidget *add_button;
+ GtkWidget *add_button, *w;
GtkCellRenderer *cr;
+ GtkAction *action;
+ GtkWidget *widget, *box, *button;
+ char *url;
g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-
-@@ -1117,6 +1215,24 @@ desktop_init (AppearanceData *data,
+@@ -1295,6 +1393,24 @@ desktop_init (AppearanceData *data,
/* create the file selector later to save time on startup */
data->wp_filesel = NULL;
@@ -164,6 +145,3 @@ index bf2f5a1..a5ff367 100644
}
void
---
-1.6.2.5
-
no-tweaks.patch:
Makefile.am | 2
appearance-main.c | 1
data/appearance.ui | 353 -----------------------------------------------------
3 files changed, 356 deletions(-)
Index: no-tweaks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/no-tweaks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- no-tweaks.patch 26 Aug 2009 01:40:37 -0000 1.4
+++ no-tweaks.patch 23 Sep 2009 22:16:29 -0000 1.5
@@ -1,6 +1,6 @@
-diff -up gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.91/capplets/appearance/appearance-main.c
---- gnome-control-center-2.27.91/capplets/appearance/appearance-main.c.no-tweaks 2009-08-24 06:54:41.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/appearance-main.c 2009-08-24 23:31:28.843978482 -0400
+diff -up gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.28.0/capplets/appearance/appearance-main.c
+--- gnome-control-center-2.28.0/capplets/appearance/appearance-main.c.no-tweaks 2009-08-24 06:54:41.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/appearance-main.c 2009-09-23 16:46:07.350650695 -0400
@@ -165,7 +165,6 @@ main (int argc, char **argv)
desktop_init (data, (const gchar **) wallpaper_files);
g_strfreev (wallpaper_files);
@@ -9,23 +9,23 @@ diff -up gnome-control-center-2.27.91/ca
/* prepare the main window */
w = appearance_capplet_get_widget (data, "appearance_window");
-diff -up gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui
---- gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui.no-tweaks 2009-08-24 23:34:19.741986359 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/data/appearance.ui 2009-08-24 23:36:37.898966013 -0400
-@@ -1530,370 +1530,6 @@
+diff -up gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui
+--- gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui.no-tweaks 2009-09-23 16:46:29.131395991 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui 2009-09-23 16:46:41.859650290 -0400
+@@ -1549,359 +1549,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <object class="GtkVBox" id="interface_vbox">
-- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="border_width">12</property>
+- <property name="orientation">vertical</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="vbox23">
-- <property name="orientation">vertical</property>
- <property name="visible">True</property>
+- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label35">
@@ -58,8 +58,8 @@ diff -up gnome-control-center-2.27.91/ca
- </child>
- <child>
- <object class="GtkVBox" id="vbox24">
-- <property name="orientation">vertical</property>
- <property name="visible">True</property>
+- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="menu_icons_toggle">
@@ -156,8 +156,8 @@ diff -up gnome-control-center-2.27.91/ca
- </child>
- <child>
- <object class="GtkVBox" id="vbox25">
-- <property name="orientation">vertical</property>
- <property name="visible">True</property>
+- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label38">
@@ -190,8 +190,8 @@ diff -up gnome-control-center-2.27.91/ca
- </child>
- <child>
- <object class="GtkVBox" id="vbox26">
-- <property name="orientation">vertical</property>
- <property name="visible">True</property>
+- <property name="orientation">vertical</property>
- <child>
- <object class="GtkMenuBar" id="menubar">
- <property name="visible">True</property>
@@ -369,23 +369,12 @@ diff -up gnome-control-center-2.27.91/ca
- <property name="position">3</property>
- </packing>
- </child>
-- <child type="tab">
-- <object class="GtkLabel" id="label40">
-- <property name="visible">True</property>
-- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-- <property name="label" translatable="yes">Interface</property>
-- </object>
-- <packing>
-- <property name="position">3</property>
-- <property name="tab_fill">False</property>
-- </packing>
-- </child>
- </object>
- <packing>
- <property name="position">1</property>
-diff -up gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.91/capplets/appearance/Makefile.am
---- gnome-control-center-2.27.91/capplets/appearance/Makefile.am.no-tweaks 2009-07-16 10:33:13.000000000 -0400
-+++ gnome-control-center-2.27.91/capplets/appearance/Makefile.am 2009-08-24 23:31:28.842973536 -0400
+ <child type="tab">
+ <object class="GtkLabel" id="label40">
+ <property name="visible">True</property>
+diff -up gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.28.0/capplets/appearance/Makefile.am
+--- gnome-control-center-2.28.0/capplets/appearance/Makefile.am.no-tweaks 2009-07-16 10:33:13.000000000 -0400
++++ gnome-control-center-2.28.0/capplets/appearance/Makefile.am 2009-09-23 16:46:14.108648780 -0400
@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
appearance-themes.h \
appearance-style.c \
- Previous message (by thread): rpms/nautilus/devel nautilus-2.28.0-revert-bg-fade-break.patch, NONE, 1.1 nautilus.spec, 1.288, 1.289
- Next message (by thread): rpms/GConf2/devel .cvsignore, 1.44, 1.45 GConf2.spec, 1.112, 1.113 sources, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list