rpms/control-center/devel mnemonic.patch, NONE, 1.1 .cvsignore, 1.89, 1.90 control-center.spec, 1.454, 1.455 fix-appearance-capplet.patch, 1.1, 1.2 make-default.patch, 1.10, 1.11 polkit1.patch, 1.2, 1.3 sources, 1.92, 1.93
Matthias Clasen
mclasen at fedoraproject.org
Thu Jul 16 00:59:22 UTC 2009
- Previous message (by thread): rpms/libcmpiutil/devel .cvsignore, 1.5, 1.6 libcmpiutil.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/control-center/devel .cvsignore, 1.90, 1.91 control-center.spec, 1.455, 1.456 sources, 1.93, 1.94
- 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-serv13074
Modified Files:
.cvsignore control-center.spec fix-appearance-capplet.patch
make-default.patch polkit1.patch sources
Added Files:
mnemonic.patch
Log Message:
fix a mnemonic
mnemonic.patch:
--- NEW FILE mnemonic.patch ---
diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.mnemonic gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui
--- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.mnemonic 2009-07-15 20:48:24.616318681 -0400
+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui 2009-07-15 20:48:45.877068043 -0400
@@ -2328,6 +2328,7 @@
<object class="GtkButton" id="color_scheme_defaults_button">
<property name="label" translatable="yes">_Reset to Defaults</property>
<property name="visible">True</property>
+ <property name="use_underline">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/.cvsignore,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- .cvsignore 30 Jun 2009 17:38:53 -0000 1.89
+++ .cvsignore 16 Jul 2009 00:59:21 -0000 1.90
@@ -1 +1 @@
-gnome-control-center-2.27.3.tar.bz2
+gnome-control-center-2.27.4.tar.bz2
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -p -r1.454 -r1.455
--- control-center.spec 14 Jul 2009 15:11:39 -0000 1.454
+++ control-center.spec 16 Jul 2009 00:59:21 -0000 1.455
@@ -17,13 +17,13 @@
%define libxklavier_version 4.0
%define gnome_menus_version 2.11.1
%define usermode_version 1.83
-%define libgnomekbd_version 2.21
+%define libgnomekbd_version 2.27.4
%define libXrandr_version 1.2.99
Summary: Utilities to configure the GNOME desktop
Name: control-center
-Version: 2.27.3
-Release: 3%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -43,27 +43,19 @@ Patch22: slab-icon-names.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=555591
Patch30: default-layout-toggle.patch
-Patch32: display-no-help.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=546036
Patch33: notification-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=574973
-Patch34: gcc-new-fingerprint-icons.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=154029
-Patch35: gnome-control-center-2.26.0-support-touchpads.patch
-
# http://bugzilla.redhat.com/show_bug.cgi?id=498365
# http://bugzilla.gnome.org/show_bug.cgi?id=536531
Patch37: polkit1.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=587355
-Patch42: gnomekbd.patch
-
# http://bugzilla.gnome.org/show_bug.cgi?id=588166
Patch43: fix-appearance-capplet.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=588729
+Patch45: mnemonic.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
@@ -182,17 +174,9 @@ utilities.
%patch10 -p0 -b .pam-fprintd
%patch22 -p0 -b .slab-icon-names
%patch30 -p1 -b .default-layout-toggle
-%patch32 -p1 -b .display-no-help
%patch33 -p1 -b .notification-theme
-%patch34 -p0 -b .new-icons
-%patch35 -p1 -b .support-touchpads
-%patch42 -p1 -b .gnomekbd
%patch43 -p1 -b .fix-appearance-capplet
-pushd capplets/about-me
-mv *png icons/
-popd
-
# vendor configuration patches
%patch95 -p1 -b .passwd
%patch96 -p1 -b .gecos
@@ -365,6 +349,9 @@ fi
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
* Tue Jul 14 2009 Adel Gadllah <adel.gadllah at gmail.com> - 2.27.3-3
- Reenable firefox options in the default applications capplet
(RH #509565)
fix-appearance-capplet.patch:
Index: fix-appearance-capplet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/fix-appearance-capplet.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- fix-appearance-capplet.patch 9 Jul 2009 15:43:14 -0000 1.1
+++ fix-appearance-capplet.patch 16 Jul 2009 00:59:22 -0000 1.2
@@ -1,8 +1,15 @@
-diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c
-index 440b25a..0814b62 100644
---- a/capplets/common/theme-thumbnail.c
-+++ b/capplets/common/theme-thumbnail.c
-@@ -164,43 +164,35 @@ static GdkPixbuf *
+diff -up gnome-control-center-2.27.4/capplets/common/theme-thumbnail.c.fix-appearance-capplet gnome-control-center-2.27.4/capplets/common/theme-thumbnail.c
+--- gnome-control-center-2.27.4/capplets/common/theme-thumbnail.c.fix-appearance-capplet 2009-05-03 14:30:56.000000000 -0400
++++ gnome-control-center-2.27.4/capplets/common/theme-thumbnail.c 2009-07-15 16:47:12.954069199 -0400
+@@ -91,7 +91,6 @@ static int pipe_from_factory_fd[2];
+ #define GTK_THUMBNAIL_SIZE 96
+ #define METACITY_THUMBNAIL_WIDTH 120
+ #define METACITY_THUMBNAIL_HEIGHT 60
+-#define ICON_THUMBNAIL_SIZE 48
+
+
+ static void
+@@ -164,44 +163,35 @@ static GdkPixbuf *
create_folder_icon (char *icon_theme_name)
{
GtkIconTheme *icon_theme;
@@ -18,7 +25,7 @@ index 440b25a..0814b62 100644
gtk_icon_theme_set_custom_theme (icon_theme, icon_theme_name);
- folder_icon_info = NULL;
-+ i = 0;
++ i = 0;
/* Get the Example icon name in the theme if specified */
example_icon_name = gtk_icon_theme_get_example_icon_name (icon_theme);
if (example_icon_name != NULL)
@@ -43,25 +50,25 @@ index 440b25a..0814b62 100644
+ folder_icon_info = gtk_icon_theme_choose_icon (icon_theme, icon_names, 48, GTK_ICON_LOOKUP_FORCE_SIZE);
if (folder_icon_info != NULL)
-- {
+ {
- filename = gtk_icon_info_get_filename (folder_icon_info);
-
- if (filename != NULL)
- {
+- {
- folder_icon = gdk_pixbuf_new_from_file (filename, NULL);
-+ g_print ("got info %s\n", gtk_icon_info_get_filename (folder_icon_info));
-+ folder_icon = gtk_icon_info_load_icon (folder_icon_info, NULL);
-+ gtk_icon_info_free (folder_icon_info);
- }
+- }
+-
++ folder_icon = gtk_icon_info_load_icon (folder_icon_info, NULL);
+ gtk_icon_info_free (folder_icon_info);
+ }
-- gtk_icon_info_free (folder_icon_info);
-- }
+ g_object_unref (icon_theme);
+ g_free (example_icon_name);
-
++
/* render the icon to the thumbnail */
if (folder_icon == NULL)
-@@ -216,25 +208,7 @@ create_folder_icon (char *icon_theme_name)
+ {
+@@ -216,25 +206,7 @@ create_folder_icon (char *icon_theme_nam
gtk_widget_destroy (dummy);
}
make-default.patch:
Index: make-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/make-default.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- make-default.patch 4 Dec 2008 18:54:50 -0000 1.10
+++ make-default.patch 16 Jul 2009 00:59:22 -0000 1.11
@@ -1,7 +1,7 @@
-diff -up gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c.make-default 2008-11-05 09:21:32.000000000 -0500
-+++ gnome-control-center-2.25.1/capplets/appearance/appearance-desktop.c 2008-11-13 14:31:40.000000000 -0500
-@@ -32,6 +32,9 @@
+diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.make-default gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.make-default 2009-07-15 11:12:52.000000000 -0400
++++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c 2009-07-15 17:08:10.808068841 -0400
+@@ -31,6 +31,9 @@
#include <libgnomeui/gnome-desktop-thumbnail.h>
#include <libgnomeui/gnome-bg.h>
@@ -11,7 +11,7 @@ diff -up gnome-control-center-2.25.1/cap
enum {
TARGET_URI_LIST,
TARGET_BGIMAGE
-@@ -988,12 +991,61 @@ wp_select_after_realize (GtkWidget *widg
+@@ -992,12 +995,61 @@ wp_select_after_realize (GtkWidget *widg
select_item (data, item, TRUE);
}
@@ -73,11 +73,11 @@ diff -up gnome-control-center-2.25.1/cap
g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-@@ -1114,6 +1166,24 @@ desktop_init (AppearanceData *data,
+@@ -1118,6 +1170,24 @@ desktop_init (AppearanceData *data,
/* create the file selector later to save time on startup */
data->wp_filesel = NULL;
-+ widget = glade_xml_get_widget (data->xml, "background_vbox");
++ widget = appearance_capplet_get_widget (data, "background_vbox");
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
+
@@ -98,24 +98,3 @@ diff -up gnome-control-center-2.25.1/cap
}
void
-diff -up gnome-control-center-2.25.1/capplets/appearance/Makefile.am.make-default gnome-control-center-2.25.1/capplets/appearance/Makefile.am
---- gnome-control-center-2.25.1/capplets/appearance/Makefile.am.make-default 2008-11-05 09:21:32.000000000 -0500
-+++ gnome-control-center-2.25.1/capplets/appearance/Makefile.am 2008-11-13 14:28:38.000000000 -0500
-@@ -42,7 +42,8 @@ gnome_appearance_properties_LDADD = \
- $(top_builddir)/capplets/common/libcommon.la \
- $(GNOMECC_CAPPLETS_LIBS) \
- $(FONT_CAPPLET_LIBS) \
-- $(METACITY_LIBS)
-+ $(METACITY_LIBS) \
-+ $(POLKIT_GNOME_LIBS)
- gnome_appearance_properties_LDFLAGS = -export-dynamic
-
- gladedir = $(pkgdatadir)/glade
-@@ -53,6 +54,7 @@ INCLUDES = \
- $(METACITY_CFLAGS) \
- $(GNOMECC_CAPPLETS_CFLAGS) \
- $(FONT_CAPPLET_CFLAGS) \
-+ $(POLKIT_GNOME_CFLAGS) \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
polkit1.patch:
Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/polkit1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- polkit1.patch 12 Jun 2009 18:43:47 -0000 1.2
+++ polkit1.patch 16 Jul 2009 00:59:22 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c.polkit1 gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c
---- gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c.polkit1 2009-06-09 13:45:16.935332926 -0400
-+++ gnome-control-center-2.26.0/capplets/about-me/gnome-about-me.c 2009-06-09 13:45:17.007312663 -0400
+diff -up gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1 gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c
+--- gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1 2009-07-15 16:52:23.630080589 -0400
++++ gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c 2009-07-15 16:52:23.668342168 -0400
@@ -36,10 +36,6 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API
#include <libgnomeui/gnome-desktop-thumbnail.h>
@@ -61,9 +61,9 @@ diff -up gnome-control-center-2.26.0/cap
g_signal_connect (me->enable_fingerprint_button, "clicked",
G_CALLBACK (about_me_fingerprint_button_clicked_cb), me);
-diff -up gnome-control-center-2.26.0/capplets/about-me/Makefile.am.polkit1 gnome-control-center-2.26.0/capplets/about-me/Makefile.am
---- gnome-control-center-2.26.0/capplets/about-me/Makefile.am.polkit1 2009-06-09 13:45:16.942317965 -0400
-+++ gnome-control-center-2.26.0/capplets/about-me/Makefile.am 2009-06-09 13:45:17.009313427 -0400
+diff -up gnome-control-center-2.27.4/capplets/about-me/Makefile.am.polkit1 gnome-control-center-2.27.4/capplets/about-me/Makefile.am
+--- gnome-control-center-2.27.4/capplets/about-me/Makefile.am.polkit1 2009-07-15 16:52:23.634066013 -0400
++++ gnome-control-center-2.27.4/capplets/about-me/Makefile.am 2009-07-15 16:52:23.669351794 -0400
@@ -26,7 +26,7 @@ gnome_about_me_SOURCES = \
if BUILD_ABOUTME
bin_PROGRAMS = gnome-about-me
@@ -81,10 +81,10 @@ diff -up gnome-control-center-2.26.0/cap
$(GAIL_CFLAGS) \
-DDATADIR="\"$(datadir)\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-diff -up gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c.polkit1 gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c.polkit1 2009-06-09 13:45:16.982323819 -0400
-+++ gnome-control-center-2.26.0/capplets/appearance/appearance-desktop.c 2009-06-12 13:05:41.315839883 -0400
-@@ -33,7 +33,6 @@
+diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1 gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1 2009-07-15 16:52:23.658335935 -0400
++++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c 2009-07-15 16:52:23.670342213 -0400
+@@ -32,7 +32,6 @@
#include <libgnomeui/gnome-bg.h>
#include <dbus/dbus-glib.h>
@@ -92,7 +92,7 @@ diff -up gnome-control-center-2.26.0/cap
enum {
TARGET_URI_LIST,
-@@ -991,6 +990,16 @@ wp_select_after_realize (GtkWidget *widg
+@@ -995,6 +994,16 @@ wp_select_after_realize (GtkWidget *widg
select_item (data, item, TRUE);
}
@@ -109,7 +109,7 @@ diff -up gnome-control-center-2.26.0/cap
static void
set_background (GtkAction *action, gpointer data)
{
-@@ -998,15 +1007,6 @@ set_background (GtkAction *action, gpoin
+@@ -1002,15 +1011,6 @@ set_background (GtkAction *action, gpoin
DBusGProxy *proxy;
DBusGConnection *connection;
GError *error;
@@ -125,7 +125,7 @@ diff -up gnome-control-center-2.26.0/cap
gconf_client_suggest_sync (adata->client, NULL);
-@@ -1027,24 +1027,70 @@ set_background (GtkAction *action, gpoin
+@@ -1031,24 +1031,70 @@ set_background (GtkAction *action, gpoin
return;
}
@@ -204,8 +204,8 @@ diff -up gnome-control-center-2.26.0/cap
GtkWidget *widget, *box, *button;
g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
-@@ -1169,18 +1215,18 @@ desktop_init (AppearanceData *data,
- widget = glade_xml_get_widget (data->xml, "background_vbox");
+@@ -1173,18 +1219,18 @@ desktop_init (AppearanceData *data,
+ widget = appearance_capplet_get_widget (data, "background_vbox");
box = gtk_hbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
-
@@ -234,31 +234,11 @@ diff -up gnome-control-center-2.26.0/cap
gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
-diff -up gnome-control-center-2.26.0/capplets/appearance/Makefile.am.polkit1 gnome-control-center-2.26.0/capplets/appearance/Makefile.am
---- gnome-control-center-2.26.0/capplets/appearance/Makefile.am.polkit1 2009-06-09 13:45:16.996323092 -0400
-+++ gnome-control-center-2.26.0/capplets/appearance/Makefile.am 2009-06-09 13:45:17.012313001 -0400
-@@ -44,8 +44,7 @@ gnome_appearance_properties_LDADD = \
- $(top_builddir)/capplets/common/libcommon.la \
- $(GNOMECC_CAPPLETS_LIBS) \
- $(FONT_CAPPLET_LIBS) \
-- $(METACITY_LIBS) \
-- $(POLKIT_GNOME_LIBS)
-+ $(METACITY_LIBS)
- gnome_appearance_properties_LDFLAGS = -export-dynamic
-
- gladedir = $(pkgdatadir)/glade
-@@ -56,7 +55,6 @@ INCLUDES = \
- $(METACITY_CFLAGS) \
- $(GNOMECC_CAPPLETS_CFLAGS) \
- $(FONT_CAPPLET_CFLAGS) \
-- $(POLKIT_GNOME_CFLAGS) \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \
-diff -up gnome-control-center-2.26.0/configure.in.polkit1 gnome-control-center-2.26.0/configure.in
---- gnome-control-center-2.26.0/configure.in.polkit1 2009-06-09 13:45:16.943314331 -0400
-+++ gnome-control-center-2.26.0/configure.in 2009-06-09 13:45:17.014319004 -0400
-@@ -102,7 +102,6 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
+diff -up gnome-control-center-2.27.4/capplets/appearance/Makefile.am.polkit1 gnome-control-center-2.27.4/capplets/appearance/Makefile.am
+diff -up gnome-control-center-2.27.4/configure.in.polkit1 gnome-control-center-2.27.4/configure.in
+--- gnome-control-center-2.27.4/configure.in.polkit1 2009-07-15 16:52:23.635066071 -0400
++++ gnome-control-center-2.27.4/configure.in 2009-07-15 16:52:23.673341548 -0400
+@@ -98,7 +98,6 @@ PKG_CHECK_MODULES(METACITY, libmetacity-
PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
PKG_CHECK_MODULES(GIO, gio-2.0)
@@ -266,7 +246,7 @@ diff -up gnome-control-center-2.26.0/con
gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
-@@ -204,11 +203,6 @@ if test "x$enable_aboutme" = "xyes"; the
+@@ -224,11 +223,6 @@ if test "x$enable_aboutme" = "xyes"; the
PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90],
[AC_DEFINE([HAVE_LIBEBOOK], 1,
[Define if evolution-data-server libebook-1.2 is available])])
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/sources,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- sources 30 Jun 2009 17:38:53 -0000 1.92
+++ sources 16 Jul 2009 00:59:22 -0000 1.93
@@ -1 +1 @@
-3b5191e5b6f4ffc30dd5f1831d6cb000 gnome-control-center-2.27.3.tar.bz2
+2a94b5ba300f9c731195bf734f59adec gnome-control-center-2.27.4.tar.bz2
- Previous message (by thread): rpms/libcmpiutil/devel .cvsignore, 1.5, 1.6 libcmpiutil.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message (by thread): rpms/control-center/devel .cvsignore, 1.90, 1.91 control-center.spec, 1.455, 1.456 sources, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list