From c561c9f4b8b64c440bb12cf962d4588fdfdb8fa1 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mar 10 2010 12:32:39 +0000 Subject: - Remove obsoleted patches --- diff --git a/0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch b/0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch deleted file mode 100644 index 5fe08b9..0000000 --- a/0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 11c5d4f3391400987c8fa41ef6e67458c1c29260 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 29 Oct 2009 12:18:37 +0000 -Subject: [PATCH] Fix all the keybindings showing up when using compiz - -The wm_common_get_current_keybindings() implementation -was broken. - -https://bugzilla.gnome.org/show_bug.cgi?id=600021 ---- - capplets/common/wm-common.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/capplets/common/wm-common.c b/capplets/common/wm-common.c -index ef38489..d2ce82a 100644 ---- a/capplets/common/wm-common.c -+++ b/capplets/common/wm-common.c -@@ -27,7 +27,7 @@ wm_common_get_window_manager_property (Atom atom) - guchar *val; - - if (wm_window == None) -- return g_strdup (WM_COMMON_UNKNOWN); -+ return NULL; - - utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False); - -@@ -46,7 +46,7 @@ wm_common_get_window_manager_property (Atom atom) - type != utf8_string || format != 8 || nitems == 0 || - !g_utf8_validate (val, nitems, NULL)) - { -- retval = g_strdup (WM_COMMON_UNKNOWN); -+ retval = NULL; - } - else - { -@@ -93,7 +93,7 @@ wm_common_get_current_keybindings (void) - char *wm_name = wm_common_get_window_manager_property (wm_atom); - char *to_copy[] = { NULL, NULL }; - -- to_copy[0] = wm_name; -+ to_copy[0] = wm_name ? wm_name : g_strdup (WM_COMMON_UNKNOWN); - - results = g_strdupv (to_copy); - g_free (wm_name); --- -1.6.5.1 - diff --git a/0001-Fix-libm-linking.patch b/0001-Fix-libm-linking.patch deleted file mode 100644 index 2d5e76f..0000000 --- a/0001-Fix-libm-linking.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a4eef676df12eb8beebd1474427a1b56a7731b50 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 10 Feb 2010 18:20:45 +0000 -Subject: [PATCH] Fix libm linking - -Otherwise we get: -/usr/bin/ld: gnome-mouse-properties.o: undefined reference to symbol 'floor@@GLIBC_2.0' -/usr/bin/ld: note: 'floor@@GLIBC_2.0' is defined in DSO /lib/libm.so.6 so try adding it to the linker command line -/lib/libm.so.6: could not read symbols: Invalid operation - -https://bugzilla.gnome.org/show_bug.cgi?id=609570 ---- - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 84eeb3e..a832547 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,6 +84,8 @@ AC_SUBST(XF86MISC_LIBS) - AC_CHECK_HEADERS(X11/extensions/XKB.h) - CPPFLAGS=$savecppflags - -+AC_CHECK_LIB(m, floor) -+ - dnl ============================================== - dnl Check that we meet the dependencies - dnl ============================================== --- -1.6.6 - diff --git a/about-me-delete.patch b/about-me-delete.patch deleted file mode 100644 index 851d3b5..0000000 --- a/about-me-delete.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c ---- gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c.about-me-delete 2009-08-17 04:40:16.000000000 -0400 -+++ gnome-control-center-2.28.0/capplets/about-me/gnome-about-me.c 2009-10-06 00:18:40.622398272 -0400 -@@ -72,6 +71,7 @@ typedef struct { - gchar *username; - - guint commit_timeout_id; -+ gboolean destroyed; - } GnomeAboutMe; - - static GnomeAboutMe *me = NULL; -@@ -183,7 +183,8 @@ about_me_destroy (GnomeAboutMe *me) - g_free (me->person); - g_free (me->login); - g_free (me->username); -- g_free (me); -+ -+ me->destroyed = TRUE; - } - - static void -@@ -275,6 +276,9 @@ about_me_focus_out (GtkWidget *widget, G - const gchar *wid; - gint i; - -+ if (me->destroyed) -+ return FALSE; -+ - wid = gtk_widget_get_name (widget); - - if (wid == NULL) diff --git a/and-no-wrong-keybindings-either.patch b/and-no-wrong-keybindings-either.patch deleted file mode 100644 index 8b8bf66..0000000 --- a/and-no-wrong-keybindings-either.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c ---- gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c.wm-confusion 2009-12-10 13:03:24.592158905 -0500 -+++ gnome-control-center-2.28.1/capplets/keybindings/gnome-keybinding-properties.c 2009-12-10 13:03:33.484378505 -0500 -@@ -868,7 +868,7 @@ append_keys_to_tree_from_file (GtkBuilde - /* If there's no keys to add, or the settings apply to a window manager - * that's not the one we're running */ - if (keylist->entries->len == 0 -- || (keylist->wm_name != NULL && strv_contains (wm_keybindings, keylist->wm_name)) -+ || (keylist->wm_name != NULL && !strv_contains (wm_keybindings, keylist->wm_name)) - || keylist->name == NULL) - { - g_free (keylist->name); diff --git a/control-center-2.19.3-no-gnome-common.patch b/control-center-2.19.3-no-gnome-common.patch deleted file mode 100644 index 75a2c99..0000000 --- a/control-center-2.19.3-no-gnome-common.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome-control-center-2.19.3/configure.in.no-gnome-common 2007-06-04 07:04:04.000000000 -0400 -+++ gnome-control-center-2.19.3/configure.in 2007-06-05 00:34:32.000000000 -0400 -@@ -44,11 +44,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE - - AM_GLIB_GNU_GETTEXT - --GNOME_COMMON_INIT --GNOME_DEBUG_CHECK --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - AC_PATH_XTRA - x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" - diff --git a/control-center.spec b/control-center.spec index 31431c9..a57e86d 100644 --- a/control-center.spec +++ b/control-center.spec @@ -24,7 +24,7 @@ Summary: Utilities to configure the GNOME desktop Name: control-center Version: 2.29.92 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops @@ -33,7 +33,6 @@ Source1: org.gnome.control-center.defaultbackground.policy Source2: apply-extra-translations Source3: extra-translations -Patch3: control-center-2.19.3-no-gnome-common.patch # http://bugzilla.gnome.org/536531 Patch7: make-default.patch @@ -46,15 +45,6 @@ Patch22: slab-icon-names.patch # http://bugzilla.gnome.org/show_bug.cgi?id=555591 Patch30: default-layout-toggle.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=600021 -Patch31: 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=588729 -Patch45: mnemonic.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=590349 -Patch47: save-as.patch - # https://bugzilla.gnome.org/show_bug.cgi?id=597066 Patch52: shell-markup.patch @@ -196,7 +186,6 @@ for the GNOME desktop. %patch10 -p0 -b .pam-fprintd %patch22 -p0 -b .slab-icon-names %patch30 -p1 -b .default-layout-toggle -%patch47 -p1 -b .save-as %patch52 -p1 -b .shell-markup %patch56 -p1 -b .best-shapes %patch60 -p1 -b .override-redirect @@ -394,6 +383,9 @@ fi %changelog +* Wed Mar 10 2010 Bastien Nocera 2.29.92-2 +- Remove obsoleted patches + * Tue Mar 09 2010 Bastien Nocera 2.29.92-1 - Update to 2.29.92 diff --git a/finger-icons.patch b/finger-icons.patch deleted file mode 100644 index e335c80..0000000 --- a/finger-icons.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c ---- gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c.finger-icons 2009-10-26 13:02:36.578802754 -0400 -+++ gnome-control-center-2.28.1/capplets/about-me/gnome-about-me-fingerprint.c 2009-10-26 13:03:11.893802706 -0400 -@@ -468,7 +468,7 @@ assistant_prepare (GtkAssistant *ass, Gt - { - char *filename; - -- filename = g_strdup_printf ("%s.png", data->finger); -+ filename = g_strdup_printf ("%s.svg", data->finger); - path = g_build_filename (GNOMECC_PIXMAP_DIR, filename, NULL); - g_free (filename); - } diff --git a/fix-background-tooltips.patch b/fix-background-tooltips.patch deleted file mode 100644 index 0ad1666..0000000 --- a/fix-background-tooltips.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gnome-control-center-2.28.0/capplets/appearance/appearance-desktop.c 2009-09-28 20:01:16.896708487 -0400 -+++ hacked/capplets/appearance/appearance-desktop.c 2009-09-28 19:56:21.977442977 -0400 -@@ -1246,8 +1246,6 @@ - GtkWidget *widget, *box, *button; - char *url; - -- g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL); -- - data->wp_update_gconf = TRUE; - - data->wp_uris = NULL; -@@ -1387,6 +1385,7 @@ - (GCallback) wp_props_wp_selected, data); - g_signal_connect (data->wp_view, "query-tooltip", - (GCallback) wp_view_tooltip_cb, data); -+ gtk_widget_set_has_tooltip (data->wp_view, TRUE); - - wp_set_sensitivities (data); - diff --git a/keybinding-bugs.patch b/keybinding-bugs.patch deleted file mode 100644 index 11750a9..0000000 --- a/keybinding-bugs.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e0c60bbd3064a67b975d92adc417878ea8949c95 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Thu, 1 Oct 2009 12:45:25 +1000 -Subject: [PATCH] Fix broken logic in keybinding tree model - ---- - capplets/keybindings/gnome-keybinding-properties.c | 24 ++++++++----------- - 1 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c -index 6e36e34..0b62f8c 100644 ---- a/capplets/keybindings/gnome-keybinding-properties.c -+++ b/capplets/keybindings/gnome-keybinding-properties.c -@@ -522,11 +522,10 @@ find_section (GtkTreeModel *model, - GtkTreeIter *iter, - const char *title) - { -- gboolean success, found; -+ gboolean success; - -- found = FALSE; - success = gtk_tree_model_get_iter_first (model, iter); -- while (success && !found) -+ while (success) - { - char *description = NULL; - -@@ -534,16 +533,15 @@ find_section (GtkTreeModel *model, - DESCRIPTION_COLUMN, &description, - -1); - -- found = (g_strcmp0 (description, title) == 0); -+ if (g_strcmp0 (description, title) == 0) -+ return; - success = gtk_tree_model_iter_next (model, iter); - } -- if (!found) -- { -- gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL); -- gtk_tree_store_set (GTK_TREE_STORE (model), iter, -- DESCRIPTION_COLUMN, title, -- -1); -- } -+ -+ gtk_tree_store_append (GTK_TREE_STORE (model), iter, NULL); -+ gtk_tree_store_set (GTK_TREE_STORE (model), iter, -+ DESCRIPTION_COLUMN, title, -+ -1); - } - - static void -@@ -555,7 +553,6 @@ append_keys_to_tree (GtkBuilder *builder, - GtkTreeIter parent_iter, iter; - GtkTreeModel *model; - gint i, j; -- gint rows_before; - - client = gconf_client_get_default (); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (gtk_builder_get_object (builder, "shortcut_treeview"))); -@@ -571,7 +568,6 @@ append_keys_to_tree (GtkBuilder *builder, - * then we need to scroll now */ - ensure_scrollbar (builder, i - 1); - -- rows_before = i; - for (j = 0; keys_list[j].name != NULL; j++) - { - GConfEntry *entry; -@@ -689,7 +685,7 @@ append_keys_to_tree (GtkBuilder *builder, - g_object_unref (client); - - /* Don't show an empty section */ -- if (i == rows_before) -+ if (gtk_tree_model_iter_n_children (model, &parent_iter) == 0) - gtk_tree_store_remove (GTK_TREE_STORE (model), &parent_iter); - - if (i == 0) --- -1.6.3.3 - diff --git a/mirror-crash.patch b/mirror-crash.patch deleted file mode 100644 index b0edda6..0000000 --- a/mirror-crash.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- gnome-control-center-2.28.0/capplets/display/xrandr-capplet.c 2009-08-24 06:54:41.000000000 -0400 -+++ hacked/capplets/display/xrandr-capplet.c 2009-09-30 09:29:05.160839814 -0400 -@@ -516,6 +516,7 @@ - { - int i; - GnomeRRMode **modes; -+ int best_w, best_h; - const char *current; - - clear_combo (app->resolution_combo); -@@ -533,6 +534,8 @@ - - gtk_widget_set_sensitive (app->resolution_combo, TRUE); - -+ best_w = 0; -+ best_h = 0; - for (i = 0; modes[i] != NULL; ++i) - { - int width, height; -@@ -543,12 +546,21 @@ - add_key (app->resolution_combo, - idle_free (make_resolution_string (width, height)), - width, height, 0, -1); -+ -+ if (width * height > best_w * best_h) -+ { -+ best_w = width; -+ best_h = height; -+ } - } - - current = idle_free (make_resolution_string (app->current_output->width, app->current_output->height)); - - if (!combo_select (app->resolution_combo, current)) -- g_assert_not_reached (); -+ { -+ combo_select (app->resolution_combo, -+ idle_free (make_resolution_string (best_w, best_h))); -+ } - } - - static void diff --git a/mnemonic.patch b/mnemonic.patch deleted file mode 100644 index 2b75a4e..0000000 --- a/mnemonic.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 @@ - - _Reset to Defaults - True -+ True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff --git a/monitor-aspect.patch b/monitor-aspect.patch deleted file mode 100644 index e4c5de6..0000000 --- a/monitor-aspect.patch +++ /dev/null @@ -1,517 +0,0 @@ -From 7d9a95c5197a3855f4d5b560c8dec860a029da03 Mon Sep 17 00:00:00 2001 -From: William Jon McCann -Date: Fri, 4 Dec 2009 19:54:47 -0500 -Subject: [PATCH] Add support for per-monitor backgrounds - -https://bugzilla.gnome.org/show_bug.cgi?id=147808 ---- - capplets/appearance/appearance-desktop.c | 171 +++++++++++++++++++++++------- - capplets/appearance/appearance.h | 4 + - capplets/appearance/gnome-wp-item.c | 65 +++++++---- - capplets/appearance/gnome-wp-item.h | 10 ++- - 4 files changed, 184 insertions(+), 66 deletions(-) - -diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c -index 5979654..2ae6bd6 100644 ---- a/capplets/appearance/appearance-desktop.c -+++ b/capplets/appearance/appearance-desktop.c -@@ -82,7 +82,6 @@ get_selected_item (AppearanceData *data, - if (selected != NULL) - { - GtkTreeIter sel_iter; -- gchar *wpfile; - - gtk_tree_model_get_iter (data->wp_model, &sel_iter, - selected->data); -@@ -93,10 +92,7 @@ get_selected_item (AppearanceData *data, - if (iter) - *iter = sel_iter; - -- gtk_tree_model_get (data->wp_model, &sel_iter, 2, &wpfile, -1); -- -- item = g_hash_table_lookup (data->wp_hash, wpfile); -- g_free (wpfile); -+ gtk_tree_model_get (data->wp_model, &sel_iter, 1, &item, -1); - } - - return item; -@@ -129,7 +125,10 @@ static void on_item_changed (GnomeBG *bg, AppearanceData *data) { - - g_signal_handlers_block_by_func (bg, G_CALLBACK (on_item_changed), data); - -- pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory); -+ pixbuf = gnome_wp_item_get_thumbnail (item, -+ data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height); - if (pixbuf) { - gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1); - g_object_unref (pixbuf); -@@ -153,13 +152,14 @@ wp_props_load_wallpaper (gchar *key, - - gtk_list_store_append (GTK_LIST_STORE (data->wp_model), &iter); - -- pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory); -+ pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height); - gnome_wp_item_update_description (item); - - gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, - 0, pixbuf, -- 1, item->description, -- 2, item->filename, -+ 1, item, - -1); - - if (pixbuf != NULL) -@@ -313,7 +313,9 @@ wp_scale_type_changed (GtkComboBox *combobox, - - item->options = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_style_menu)); - -- pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory); -+ pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height); - gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1); - if (pixbuf != NULL) - g_object_unref (pixbuf); -@@ -338,7 +340,9 @@ wp_shade_type_changed (GtkWidget *combobox, - - item->shade_type = gtk_combo_box_get_active (GTK_COMBO_BOX (data->wp_color_menu)); - -- pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory); -+ pixbuf = gnome_wp_item_get_thumbnail (item, data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height); - gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1); - if (pixbuf != NULL) - g_object_unref (pixbuf); -@@ -768,7 +772,6 @@ wp_view_tooltip_cb (GtkWidget *widget, - AppearanceData *data) - { - GtkTreeIter iter; -- gchar *wpfile; - GnomeWPItem *item; - - if (gtk_icon_view_get_tooltip_context (data->wp_view, -@@ -778,10 +781,7 @@ wp_view_tooltip_cb (GtkWidget *widget, - NULL, - &iter)) - { -- gtk_tree_model_get (data->wp_model, &iter, 2, &wpfile, -1); -- item = g_hash_table_lookup (data->wp_hash, wpfile); -- g_free (wpfile); -- -+ gtk_tree_model_get (data->wp_model, &iter, 1, &item, -1); - gtk_tooltip_set_markup (tooltip, item->description); - - return TRUE; -@@ -795,31 +795,25 @@ wp_list_sort (GtkTreeModel *model, - GtkTreeIter *a, GtkTreeIter *b, - AppearanceData *data) - { -- gchar *foo, *bar; -- gchar *desca, *descb; -+ GnomeWPItem *itema, *itemb; - gint retval; - -- gtk_tree_model_get (model, a, 1, &desca, 2, &foo, -1); -- gtk_tree_model_get (model, b, 1, &descb, 2, &bar, -1); -+ gtk_tree_model_get (model, a, 1, &itema, -1); -+ gtk_tree_model_get (model, b, 1, &itemb, -1); - -- if (!strcmp (foo, "(none)")) -+ if (!strcmp (itema->filename, "(none)")) - { - retval = -1; - } -- else if (!strcmp (bar, "(none)")) -+ else if (!strcmp (itemb->filename, "(none)")) - { - retval = 1; - } - else - { -- retval = g_utf8_collate (desca, descb); -+ retval = g_utf8_collate (itema->description, itemb->description); - } - -- g_free (desca); -- g_free (descb); -- g_free (foo); -- g_free (bar); -- - return retval; - } - -@@ -875,6 +869,68 @@ wp_update_preview (GtkFileChooser *chooser, - } - - static gboolean -+reload_item (GtkTreeModel *model, -+ GtkTreePath *path, -+ GtkTreeIter *iter, -+ AppearanceData *data) -+{ -+ GnomeWPItem *item; -+ GdkPixbuf *pixbuf; -+ -+ gtk_tree_model_get (model, iter, 1, &item, -1); -+ -+ pixbuf = gnome_wp_item_get_thumbnail (item, -+ data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height); -+ if (pixbuf) { -+ gtk_list_store_set (GTK_LIST_STORE (data->wp_model), iter, 0, pixbuf, -1); -+ g_object_unref (pixbuf); -+ } -+ -+ return FALSE; -+} -+ -+static gdouble -+get_monitor_aspect_ratio_for_widget (GtkWidget *widget) -+{ -+ gdouble aspect; -+ gint monitor; -+ GdkRectangle rect; -+ -+ monitor = gdk_screen_get_monitor_at_window (gtk_widget_get_screen (widget), gtk_widget_get_window (widget)); -+ gdk_screen_get_monitor_geometry (gtk_widget_get_screen (widget), monitor, &rect); -+ aspect = rect.height / (gdouble)rect.width; -+ -+ return aspect; -+} -+ -+#define LIST_IMAGE_SIZE 108 -+ -+static void -+compute_thumbnail_sizes (AppearanceData *data) -+{ -+ gdouble aspect; -+ -+ aspect = get_monitor_aspect_ratio_for_widget (GTK_WIDGET (data->wp_view)); -+ if (aspect > 1) { -+ /* portrait */ -+ data->thumb_width = LIST_IMAGE_SIZE / aspect; -+ data->thumb_height = LIST_IMAGE_SIZE; -+ } else { -+ data->thumb_width = LIST_IMAGE_SIZE; -+ data->thumb_height = LIST_IMAGE_SIZE * aspect; -+ } -+} -+ -+static void -+reload_wallpapers (AppearanceData *data) -+{ -+ compute_thumbnail_sizes (data); -+ gtk_tree_model_foreach (data->wp_model, (GtkTreeModelForeachFunc)reload_item, data); -+} -+ -+static gboolean - wp_load_stuffs (void *user_data) - { - AppearanceData *data; -@@ -883,6 +939,8 @@ wp_load_stuffs (void *user_data) - - data = (AppearanceData *) user_data; - -+ compute_thumbnail_sizes (data); -+ - gnome_wp_xml_load_list (data); - g_hash_table_foreach (data->wp_hash, (GHFunc) wp_props_load_wallpaper, - data); -@@ -976,8 +1034,11 @@ static void - wp_select_after_realize (GtkWidget *widget, - AppearanceData *data) - { -- GnomeWPItem *item = get_selected_item (data, NULL); -+ GnomeWPItem *item; -+ -+ g_idle_add (wp_load_stuffs, data); - -+ item = get_selected_item (data, NULL); - if (item == NULL) - item = g_hash_table_lookup (data->wp_hash, "(none)"); - -@@ -1043,7 +1104,11 @@ next_frame (AppearanceData *data, - item = get_selected_item (data, &iter); - - if (frame >= 0) -- pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame); -+ pixbuf = gnome_wp_item_get_frame_thumbnail (item, -+ data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height, -+ frame); - if (pixbuf) { - gtk_list_store_set (GTK_LIST_STORE (data->wp_model), &iter, 0, pixbuf, -1); - g_object_unref (pixbuf); -@@ -1056,7 +1121,11 @@ next_frame (AppearanceData *data, - pb = buttons[0]; - } - else { -- pixbuf = gnome_wp_item_get_frame_thumbnail (item, data->thumb_factory, frame + 1); -+ pixbuf = gnome_wp_item_get_frame_thumbnail (item, -+ data->thumb_factory, -+ data->thumb_width, -+ data->thumb_height, -+ frame + 1); - if (pixbuf) - g_object_unref (pixbuf); - else -@@ -1140,6 +1209,13 @@ buttons_cell_data_func (GtkCellLayout *layout, - gtk_tree_path_free (path); - } - -+static void -+screen_monitors_changed (GdkScreen *screen, -+ AppearanceData *data) -+{ -+ reload_wallpapers (data); -+} -+ - void - desktop_init (AppearanceData *data, - const gchar **uris) -@@ -1194,9 +1270,8 @@ desktop_init (AppearanceData *data, - (GConfClientNotifyFunc) wp_color2_changed, - data, NULL, NULL); - -- data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (3, GDK_TYPE_PIXBUF, -- G_TYPE_STRING, -- G_TYPE_STRING)); -+ data->wp_model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, -+ G_TYPE_POINTER)); - - data->wp_view = GTK_ICON_VIEW (appearance_capplet_get_widget (data, "wp_view")); - gtk_icon_view_set_model (data->wp_view, GTK_TREE_MODEL (data->wp_model)); -@@ -1232,12 +1307,12 @@ desktop_init (AppearanceData *data, - - data->frame = -1; - -- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 2, -+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (data->wp_model), 1, - (GtkTreeIterCompareFunc) wp_list_sort, - data, NULL); - - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (data->wp_model), -- 2, GTK_SORT_ASCENDING); -+ 1, GTK_SORT_ASCENDING); - - gtk_drag_dest_set (GTK_WIDGET (data->wp_view), GTK_DEST_DEFAULT_ALL, drop_types, - G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE); -@@ -1280,14 +1355,20 @@ desktop_init (AppearanceData *data, - - g_signal_connect (data->wp_rem_button, "clicked", - (GCallback) wp_remove_wallpaper, data); -- -- g_idle_add (wp_load_stuffs, data); -+ data->screen_monitors_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)), -+ "monitors-changed", -+ G_CALLBACK (screen_monitors_changed), -+ data); -+ data->screen_size_handler = g_signal_connect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)), -+ "size-changed", -+ G_CALLBACK (screen_monitors_changed), -+ data); - - g_signal_connect (data->wp_view, "selection-changed", - (GCallback) wp_props_wp_selected, data); - g_signal_connect (data->wp_view, "query-tooltip", - (GCallback) wp_view_tooltip_cb, data); -- gtk_widget_set_has_tooltip (data->wp_view, TRUE); -+ gtk_widget_set_has_tooltip (GTK_WIDGET (data->wp_view), TRUE); - - wp_set_sensitivities (data); - -@@ -1300,6 +1381,18 @@ void - desktop_shutdown (AppearanceData *data) - { - gnome_wp_xml_save_list (data); -+ -+ if (data->screen_monitors_handler > 0) { -+ g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)), -+ data->screen_monitors_handler); -+ data->screen_monitors_handler = 0; -+ } -+ if (data->screen_size_handler > 0) { -+ g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (data->wp_view)), -+ data->screen_size_handler); -+ data->screen_size_handler = 0; -+ } -+ - g_slist_foreach (data->wp_uris, (GFunc) g_free, NULL); - g_slist_free (data->wp_uris); - if (data->wp_filesel) -diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h -index 5b4dd59..c598b06 100644 ---- a/capplets/appearance/appearance.h -+++ b/capplets/appearance/appearance.h -@@ -36,6 +36,8 @@ typedef struct - GConfClient *client; - GtkBuilder *ui; - GnomeDesktopThumbnailFactory *thumb_factory; -+ gulong screen_size_handler; -+ gulong screen_monitors_handler; - - /* desktop */ - GHashTable *wp_hash; -@@ -51,6 +53,8 @@ typedef struct - GtkWidget *wp_image; - GSList *wp_uris; - gint frame; -+ gint thumb_width; -+ gint thumb_height; - - /* font */ - GtkWidget *font_details; -diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c -index b4c86f2..b4af8fc 100644 ---- a/capplets/appearance/gnome-wp-item.c -+++ b/capplets/appearance/gnome-wp-item.c -@@ -205,22 +205,19 @@ add_slideshow_frame (GdkPixbuf *pixbuf) - return tmp; - } - --#define LIST_IMAGE_WIDTH 108 -- - GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item, - GnomeDesktopThumbnailFactory * thumbs, -+ int width, -+ int height, - gint frame) { - GdkPixbuf *pixbuf = NULL; -- double aspect = -- (double)gdk_screen_get_height (gdk_screen_get_default()) / -- gdk_screen_get_width (gdk_screen_get_default()); - - set_bg_properties (item); - - if (frame != -1) -- pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect, frame); -+ pixbuf = gnome_bg_create_frame_thumbnail (item->bg, thumbs, gdk_screen_get_default (), width, height, frame); - else -- pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), LIST_IMAGE_WIDTH, LIST_IMAGE_WIDTH * aspect); -+ pixbuf = gnome_bg_create_thumbnail (item->bg, thumbs, gdk_screen_get_default(), width, height); - - if (pixbuf && gnome_bg_changes_with_time (item->bg)) - { -@@ -231,15 +228,17 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item, - pixbuf = tmp; - } - -- gnome_bg_get_image_size (item->bg, thumbs, &item->width, &item->height); -+ gnome_bg_get_image_size (item->bg, thumbs, width, height, &item->width, &item->height); - - return pixbuf; - } - - - GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item, -- GnomeDesktopThumbnailFactory * thumbs) { -- return gnome_wp_item_get_frame_thumbnail (item, thumbs, -1); -+ GnomeDesktopThumbnailFactory * thumbs, -+ gint width, -+ gint height) { -+ return gnome_wp_item_get_frame_thumbnail (item, thumbs, width, height, -1); - } - - void gnome_wp_item_update_description (GnomeWPItem * item) { -@@ -252,37 +251,55 @@ void gnome_wp_item_update_description (GnomeWPItem * item) { - gchar *size; - gchar *dirname = g_path_get_dirname (item->filename); - -+ description = NULL; -+ size = NULL; -+ - if (strcmp (item->fileinfo->mime_type, "application/xml") == 0) - { - if (gnome_bg_changes_with_time (item->bg)) - description = _("Slide Show"); -- else -+ else if (item->width > 0 && item->height > 0) - description = _("Image"); - } - else - description = g_content_type_get_description (item->fileinfo->mime_type); - -- if (gnome_bg_changes_with_size (item->bg)) -+ if (gnome_bg_has_multiple_sizes (item->bg)) - size = g_strdup (_("multiple sizes")); -- else -+ else if (item->width > 0 && item->height > 0) { - /* translators: x pixel(s) by y pixel(s) */ - size = g_strdup_printf ("%d %s by %d %s", - item->width, - ngettext ("pixel", "pixels", item->width), - item->height, - ngettext ("pixel", "pixels", item->height)); -+ } -+ -+ if (description && size) { -+ /* translators: wallpaper name -+ * mime type, size -+ * Folder: /path/to/file -+ */ -+ item->description = g_markup_printf_escaped (_("%s\n" -+ "%s, %s\n" -+ "Folder: %s"), -+ item->name, -+ description, -+ size, -+ dirname); -+ } else { -+ /* translators: wallpaper name -+ * Image missing -+ * Folder: /path/to/file -+ */ -+ item->description = g_markup_printf_escaped (_("%s\n" -+ "%s\n" -+ "Folder: %s"), -+ item->name, -+ _("Image missing"), -+ dirname); -+ } - -- /* translators: wallpaper name -- * mime type, size -- * Folder: /path/to/file -- */ -- item->description = g_markup_printf_escaped (_("%s\n" -- "%s, %s\n" -- "Folder: %s"), -- item->name, -- description, -- size, -- dirname); - g_free (size); - g_free (dirname); - } -diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h -index 63bdb69..03dc417 100644 ---- a/capplets/appearance/gnome-wp-item.h -+++ b/capplets/appearance/gnome-wp-item.h -@@ -71,10 +71,14 @@ GnomeWPItem * gnome_wp_item_new (const gchar *filename, - - void gnome_wp_item_free (GnomeWPItem *item); - GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem *item, -- GnomeDesktopThumbnailFactory *thumbs); --GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item, - GnomeDesktopThumbnailFactory *thumbs, -- gint frame); -+ gint width, -+ gint height); -+GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem *item, -+ GnomeDesktopThumbnailFactory *thumbs, -+ gint width, -+ gint height, -+ gint frame); - void gnome_wp_item_update (GnomeWPItem *item); - void gnome_wp_item_update_description (GnomeWPItem *item); - void gnome_wp_item_ensure_gnome_bg (GnomeWPItem *item); --- -1.6.5.2 - diff --git a/no-duplicate-keybindings-dammit.patch b/no-duplicate-keybindings-dammit.patch deleted file mode 100644 index 1721e71..0000000 --- a/no-duplicate-keybindings-dammit.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gnome-control-center-2.28.1/capplets/common/wm-common.c 2009-09-21 06:44:55.000000000 -0400 -+++ hacked/capplets/common/wm-common.c 2009-12-08 21:31:52.318541572 -0500 -@@ -27,7 +27,7 @@ - guchar *val; - - if (wm_window == None) -- return g_strdup (WM_COMMON_UNKNOWN); -+ return NULL; - - utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False); - -@@ -46,7 +46,7 @@ - type != utf8_string || format != 8 || nitems == 0 || - !g_utf8_validate (val, nitems, NULL)) - { -- retval = g_strdup (WM_COMMON_UNKNOWN); -+ retval = NULL; - } - else - { -@@ -93,7 +93,7 @@ - char *wm_name = wm_common_get_window_manager_property (wm_atom); - char *to_copy[] = { NULL, NULL }; - -- to_copy[0] = wm_name; -+ to_copy[0] = wm_name ? wm_name : WM_COMMON_UNKNOWN; - - results = g_strdupv (to_copy); - g_free (wm_name); diff --git a/no-tweaks.patch b/no-tweaks.patch deleted file mode 100644 index 1a8b624..0000000 --- a/no-tweaks.patch +++ /dev/null @@ -1,405 +0,0 @@ -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-24 16:43:11.954319878 -0400 -@@ -165,7 +165,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.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-21 06:44:55.000000000 -0400 -+++ gnome-control-center-2.28.0/capplets/appearance/data/appearance.ui 2009-09-24 16:45:09.691322901 -0400 -@@ -745,6 +745,7 @@ - True - False - True -+ True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True -@@ -1549,370 +1550,6 @@ - False - - -- -- -- True -- 12 -- vertical -- 18 -- -- -- True -- vertical -- 6 -- -- -- True -- 0 -- Menus and Toolbars -- -- -- -- -- -- False -- False -- 0 -- -- -- -- -- True -- -- -- True -- -- -- -- False -- False -- 0 -- -- -- -- -- True -- vertical -- 6 -- -- -- Show _icons in menus -- True -- True -- False -- True -- True -- True -- -- -- False -- False -- 0 -- -- -- -- -- _Editable menu shortcut keys -- True -- True -- False -- True -- True -- -- -- False -- False -- 2 -- -- -- -- -- True -- 12 -- -- -- True -- Toolbar _button labels: -- True -- center -- toolbar_style_select -- -- -- False -- False -- 0 -- -- -- -- -- True -- toolbar_style_liststore -- -- -- -- 0 -- -- -- -- -- False -- False -- 1 -- -- -- -- -- False -- False -- 4 -- -- -- -- -- False -- False -- 1 -- -- -- -- -- False -- False -- 1 -- -- -- -- -- False -- 0 -- -- -- -- -- True -- vertical -- 6 -- -- -- True -- 0 -- Preview -- -- -- -- -- -- False -- False -- 0 -- -- -- -- -- True -- -- -- True -- -- -- -- False -- False -- 0 -- -- -- -- -- True -- vertical -- -- -- True -- -- -- True -- _File -- True -- -- -- -- -- _New -- True -- True -- True -- -- -- -- -- _Open -- True -- True -- True -- -- -- -- -- _Save -- True -- True -- True -- -- -- -- -- True -- -- -- -- -- _Print -- True -- True -- True -- -- -- -- -- True -- -- -- -- -- _Quit -- True -- True -- True -- -- -- -- -- -- -- -- -- True -- Edit -- True -- -- -- -- -- C_ut -- True -- True -- True -- -- -- -- -- _Copy -- True -- True -- True -- -- -- -- -- _Paste -- True -- True -- True -- -- -- -- -- -- -- -- -- False -- False -- 0 -- -- -- -- -- True -- -- -- True -- -- -- True -- both -- -- -- True -- True -- gtk-new -- -- -- False -- True -- -- -- -- -- True -- gtk-open -- -- -- False -- True -- -- -- -- -- True -- gtk-save -- -- -- False -- True -- -- -- -- -- -- -- -- -- False -- 1 -- -- -- -- -- 1 -- -- -- -- -- 1 -- -- -- -- -- 1 -- -- -- -- -- 3 -- -- -- -- -- True -- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -- Interface -- -- -- 3 -- False -- -- - - - 1 -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-24 16:43:11.961075277 -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 --git a/save-as.patch b/save-as.patch deleted file mode 100644 index e60407c..0000000 --- a/save-as.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.save_as gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui ---- gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui.save_as 2009-08-03 11:41:07.595008046 -0400 -+++ gnome-control-center-2.27.4/capplets/appearance/data/appearance.ui 2009-08-03 11:41:27.273986675 -0400 -@@ -740,6 +740,7 @@ - True - False - True -+ True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK -