rpms/control-center/devel no-tweaks.patch, NONE, 1.1 control-center.spec, 1.459, 1.460 polkit1.patch, 1.4, 1.5
Matthias Clasen
mclasen at fedoraproject.org
Thu Jul 30 04:10:43 UTC 2009
- Previous message (by thread): rpms/selinux-policy/devel modules-minimum.conf, 1.24, 1.25 modules-mls.conf, 1.55, 1.56 modules-targeted.conf, 1.133, 1.134 nsadiff, 1.15, 1.16 policy-F12.patch, 1.34, 1.35 selinux-policy.spec, 1.884, 1.885
- Next message (by thread): rpms/control-center/devel control-center.spec,1.460,1.461
- 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-serv24363
Modified Files:
control-center.spec polkit1.patch
Added Files:
no-tweaks.patch
Log Message:
remove some tweaks
no-tweaks.patch:
Makefile.am | 3
appearance/Makefile.am | 2
appearance/appearance-main.c | 1
appearance/data/appearance.ui | 355 ------------------------------------------
4 files changed, 1 insertion(+), 360 deletions(-)
--- NEW FILE no-tweaks.patch ---
diff -up gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks gnome-control-center-2.27.4/capplets/appearance/appearance-main.c
--- gnome-control-center-2.27.4/capplets/appearance/appearance-main.c.no-tweaks 2009-07-29 23:41:20.056750275 -0400
+++ gnome-control-center-2.27.4/capplets/appearance/appearance-main.c 2009-07-29 23:41:38.919750322 -0400
@@ -172,7 +172,6 @@ main (int argc, char **argv)
desktop_init (data, (const gchar **) wallpaper_files);
g_strfreev (wallpaper_files);
font_init (data);
- ui_init (data);
/* prepare the main window */
w = appearance_capplet_get_widget (data, "appearance_window");
diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui
--- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.no-tweaks 2009-07-29 23:50:02.189755937 -0400
+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui 2009-07-29 23:51:04.979750545 -0400
@@ -1494,361 +1494,6 @@
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <object class="GtkVBox" id="interface_vbox">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkVBox" id="vbox23">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Menus and Toolbars</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label36">
- <property name="visible">True</property>
- <property name="label"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox24">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="menu_icons_toggle">
- <property name="label" translatable="yes">Show _icons in menus</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="menu_accel_toggle">
- <property name="label" translatable="yes">_Editable menu shortcut keys</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label37">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Toolbar _button labels:</property>
- <property name="use_underline">True</property>
- <property name="justify">center</property>
- <property name="mnemonic_widget">toolbar_style_select</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="toolbar_style_select">
- <property name="visible">True</property>
- <property name="model">toolbar_style_liststore</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox25">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Preview</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label39">
- <property name="visible">True</property>
- <property name="label"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox26">
- <property name="visible">True</property>
- <child>
- <object class="GtkMenuBar" id="menubar">
- <property name="visible">True</property>
- <child>
- <object class="GtkMenuItem" id="File Menu">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="File Menu_menu">
- <child>
- <object class="GtkImageMenuItem" id="menu_item_1">
- <property name="label">_New</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="menu_item_2">
- <property name="label">_Open</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="menu_item_3">
- <property name="label">_Save</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="separator1">
- <property name="visible">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="menu_item_4">
- <property name="label">_Print</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="separator2">
- <property name="visible">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="menu_item_5">
- <property name="label">_Quit</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="edit">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="edit1_menu">
- <child>
- <object class="GtkImageMenuItem" id="cut">
- <property name="label">C_ut</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="copy">
- <property name="label">_Copy</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="paste">
- <property name="label">_Paste</property>
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="toolbar_align">
- <property name="visible">True</property>
- <child>
- <object class="GtkHandleBox" id="toolbar_handlebox">
- <property name="visible">True</property>
- <child>
- <object class="GtkToolbar" id="toolbar_toolbar">
- <property name="visible">True</property>
- <property name="toolbar_style">both</property>
- <child>
- <object class="GtkToolButton" id="button2">
- <property name="visible">True</property>
- <property name="is_important">True</property>
- <property name="stock_id">gtk-new</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="button4">
- <property name="visible">True</property>
- <property name="stock_id">gtk-open</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="save_button">
- <property name="visible">True</property>
- <property name="stock_id">gtk-save</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <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.4/capplets/appearance/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/appearance/Makefile.am
--- gnome-control-center-2.27.4/capplets/appearance/Makefile.am.no-tweaks 2009-07-29 23:40:35.174501065 -0400
+++ gnome-control-center-2.27.4/capplets/appearance/Makefile.am 2009-07-29 23:40:51.076500481 -0400
@@ -16,8 +16,6 @@ gnome_appearance_properties_SOURCES = \
appearance-themes.h \
appearance-style.c \
appearance-style.h \
- appearance-ui.c \
- appearance-ui.h \
gedit-message-area.c \
gedit-message-area.h \
gnome-wp-info.c \
diff -up gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks gnome-control-center-2.27.4/capplets/Makefile.am
--- gnome-control-center-2.27.4/capplets/Makefile.am.no-tweaks 2009-07-29 23:39:52.413505115 -0400
+++ gnome-control-center-2.27.4/capplets/Makefile.am 2009-07-29 23:40:01.297501055 -0400
@@ -6,8 +6,7 @@ always_built_SUBDIRS = \
keybindings \
keyboard \
mouse \
- network \
- windows
+ network
SUBDIRS = $(always_built_SUBDIRS)
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -p -r1.459 -r1.460
--- control-center.spec 30 Jul 2009 02:52:51 -0000 1.459
+++ control-center.spec 30 Jul 2009 04:10:42 -0000 1.460
@@ -23,7 +23,7 @@
Summary: Utilities to configure the GNOME desktop
Name: control-center
Version: 2.27.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
Group: User Interface/Desktops
@@ -57,6 +57,9 @@ Patch43: fix-appearance-capplet.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=588729
Patch45: mnemonic.patch
+# http://mail.gnome.org/archives/gnomecc-list/2009-July/msg00015.html
+Patch46: no-tweaks.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
@@ -177,6 +180,7 @@ utilities.
%patch30 -p1 -b .default-layout-toggle
%patch33 -p1 -b .notification-theme
%patch43 -p1 -b .fix-appearance-capplet
+%patch46 -p1 -b .no-tweaks
# vendor configuration patches
%patch95 -p1 -b .passwd
@@ -330,7 +334,6 @@ fi
%{_bindir}/gnome-mouse-properties
%{_bindir}/gnome-network-properties
%{_bindir}/gnome-typing-monitor
-%{_bindir}/gnome-window-properties
%{_bindir}/gnome-font-viewer
%{_bindir}/gnome-thumbnail-font
%{_libdir}/*.so.*
@@ -354,6 +357,9 @@ fi
%dir %{_datadir}/gnome-control-center/keybindings
%changelog
+* Wed Jul 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-2
+- Omit some 'tweaky' preferences
+
* Wed Jul 15 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-1
- Update to 2.27.4
polkit1.patch:
capplets/about-me/gnome-about-me.c | 33 ---------
capplets/appearance/appearance-desktop.c | 104 ++++++++++++++++++++++---------
configure.in | 6 -
3 files changed, 75 insertions(+), 68 deletions(-)
Index: polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/polkit1.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- polkit1.patch 30 Jul 2009 02:52:51 -0000 1.4
+++ polkit1.patch 30 Jul 2009 04:10:43 -0000 1.5
@@ -1,7 +1,7 @@
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-06-15 07:00:02.000000000 -0400
-+++ gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c 2009-07-23 15:01:19.841482208 -0400
-@@ -167,28 +167,6 @@ about_me_error (GtkWindow *parent, gchar
+--- gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c.polkit1 2009-07-29 23:03:00.921501104 -0400
++++ gnome-control-center-2.27.4/capplets/about-me/gnome-about-me.c 2009-07-29 23:03:01.006500314 -0400
+@@ -169,28 +169,6 @@ about_me_error (GtkWindow *parent, gchar
gtk_widget_destroy (dialog);
}
@@ -30,7 +30,7 @@ diff -up gnome-control-center-2.27.4/cap
/********************/
static void
about_me_destroy (GnomeAboutMe *me)
-@@ -1034,19 +1012,8 @@ about_me_setup_dialog (void)
+@@ -1194,19 +1172,8 @@ about_me_setup_dialog (void)
g_signal_connect (widget, "clicked",
G_CALLBACK (about_me_image_clicked_cb), me);
@@ -51,8 +51,8 @@ diff -up gnome-control-center-2.27.4/cap
g_signal_connect (me->enable_fingerprint_button, "clicked",
G_CALLBACK (about_me_fingerprint_button_clicked_cb), me);
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-23 15:01:19.833483423 -0400
-+++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c 2009-07-23 15:01:19.842481776 -0400
+--- gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c.polkit1 2009-07-29 23:03:00.942500211 -0400
++++ gnome-control-center-2.27.4/capplets/appearance/appearance-desktop.c 2009-07-29 23:03:01.008501058 -0400
@@ -32,7 +32,6 @@
#include <libgnomeui/gnome-bg.h>
@@ -204,9 +204,17 @@ diff -up gnome-control-center-2.27.4/cap
g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
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-23 15:02:20.359485300 -0400
-+++ gnome-control-center-2.27.4/configure.in 2009-07-23 15:02:28.628752812 -0400
-@@ -223,11 +223,6 @@ if test "x$enable_aboutme" = "xyes"; the
+--- gnome-control-center-2.27.4/configure.in.polkit1 2009-07-29 23:03:00.926500063 -0400
++++ gnome-control-center-2.27.4/configure.in 2009-07-29 23:08:09.582750857 -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)
+-PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome)
+
+ gtk_lib_dir=`$PKG_CONFIG --variable libdir gtk+-2.0`
+ gtk_binary_version=`$PKG_CONFIG --variable gtk_binary_version gtk+-2.0`
+@@ -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])])
@@ -217,4 +225,4 @@ diff -up gnome-control-center-2.27.4/con
- has_polkit=false)
fi
- AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes")
+ PKG_CHECK_MODULES(GAIL, [gail])
- Previous message (by thread): rpms/selinux-policy/devel modules-minimum.conf, 1.24, 1.25 modules-mls.conf, 1.55, 1.56 modules-targeted.conf, 1.133, 1.134 nsadiff, 1.15, 1.16 policy-F12.patch, 1.34, 1.35 selinux-policy.spec, 1.884, 1.885
- Next message (by thread): rpms/control-center/devel control-center.spec,1.460,1.461
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list