diff --git a/.cvsignore b/.cvsignore index cb9ac61..5ab14c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-control-center-2.29.92.tar.bz2 +gnome-control-center-2.30.0.tar.bz2 diff --git a/0001-about-me-fix-use-after-free-when-closing-window.patch b/0001-about-me-fix-use-after-free-when-closing-window.patch deleted file mode 100644 index 56488aa..0000000 --- a/0001-about-me-fix-use-after-free-when-closing-window.patch +++ /dev/null @@ -1,62 +0,0 @@ -From effd37f3011ab8b6d4f2c593fd2256cf73f626c0 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Mon, 22 Mar 2010 14:19:46 +0000 -Subject: [PATCH] about-me: fix use after free when closing window - -about_me_destroy() frees the whole data structure and it tries to do the -right thing by setting "me = NULL" afterwards, but "me" in this case is -not the global variable, but the local one which shadows it. So the -global "me" remains non-NULL and when later about_me_focus_out() is -called, it cannot know it should return early. - -It only makes sense for about_me_destroy() to operate on the global -"me", so there's no point in passing it as a parameter. - -https://bugzilla.gnome.org/show_bug.cgi?id=592348 ---- - capplets/about-me/gnome-about-me.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c -index 9551917..755dba8 100644 ---- a/capplets/about-me/gnome-about-me.c -+++ b/capplets/about-me/gnome-about-me.c -@@ -163,7 +163,7 @@ about_me_error (GtkWindow *parent, gchar *str) - - /********************/ - static void --about_me_destroy (GnomeAboutMe *me) -+about_me_destroy (void) - { - e_contact_address_free (me->addr1); - e_contact_address_free (me->addr2); -@@ -813,7 +813,7 @@ about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, GnomeAboutMe *m - about_me_commit (me); - } - -- about_me_destroy (me); -+ about_me_destroy (); - gtk_main_quit (); - } - } -@@ -855,7 +855,7 @@ about_me_setup_dialog (void) - gtk_container_add (GTK_CONTAINER (WID ("button-image")), me->image_chooser); - - if (dialog == NULL) { -- about_me_destroy (me); -+ about_me_destroy (); - return -1; - } - -@@ -890,7 +890,7 @@ about_me_setup_dialog (void) - about_me_error (NULL, _("There was an error while trying to get the addressbook information\n" \ - "Evolution Data Server can't handle the protocol")); - g_clear_error (&error); -- about_me_destroy (me); -+ about_me_destroy (); - return -1; - } - --- -1.7.0.1 - diff --git a/control-center.spec b/control-center.spec index 09b647c..fe5ce23 100644 --- a/control-center.spec +++ b/control-center.spec @@ -34,10 +34,6 @@ Source1: org.gnome.control-center.defaultbackground.policy Source2: apply-extra-translations Source3: extra-translations -# https://bugzilla.redhat.com/show_bug.cgi?id=574256 -# https://bugzilla.gnome.org/show_bug.cgi?id=592348 -Patch0: 0001-about-me-fix-use-after-free-when-closing-window.patch - # http://bugzilla.gnome.org/536531 Patch7: make-default.patch @@ -55,9 +51,6 @@ Patch52: shell-markup.patch Patch56: best-shapes.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=492974 -Patch60: override-redirect.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 @@ -184,13 +177,11 @@ for the GNOME desktop. %prep %setup -q -n gnome-control-center-%{version} -%patch0 -p1 -b .crash-on-exit %patch10 -p0 -b .pam-fprintd %patch22 -p0 -b .slab-icon-names %patch30 -p1 -b .default-layout-toggle %patch52 -p1 -b .shell-markup %patch56 -p1 -b .best-shapes -%patch60 -p1 -b .override-redirect # vendor configuration patches %patch95 -p1 -b .passwd diff --git a/override-redirect.patch b/override-redirect.patch deleted file mode 100644 index 659b330..0000000 --- a/override-redirect.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-control-center-2.28.1/typing-break/drw-break-window.c 2009-05-03 14:30:57.000000000 -0400 -+++ hacked/typing-break/drw-break-window.c 2009-12-07 13:21:07.187559944 -0500 -@@ -146,7 +146,7 @@ - NULL); - g_object_unref (client); - -- -+ g_object_set (window, "type", GTK_WINDOW_POPUP, NULL); - gtk_window_set_keep_above (GTK_WINDOW (window), TRUE); - gtk_window_fullscreen (GTK_WINDOW (window)); - gtk_window_set_modal (GTK_WINDOW (window), TRUE); diff --git a/sources b/sources index 051c44e..711ba5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5483c6069ed7e3aa65f2bc837935b5ae gnome-control-center-2.29.92.tar.bz2 +ff7a638c2aa733997c7062449c02ccca gnome-control-center-2.30.0.tar.bz2 diff --git a/threads.patch b/threads.patch deleted file mode 100644 index a291500..0000000 --- a/threads.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- gnome-control-center-2.28.1/capplets/appearance/appearance-main.c 2010-02-15 12:34:25.205013147 -0500 -+++ foo/capplets/appearance/appearance-main.c 2010-02-15 12:08:30.813030941 -0500 -@@ -39,6 +39,8 @@ - GError *err = NULL; - - g_thread_init (NULL); -+ gdk_threads_init (); -+ gdk_threads_enter (); - theme_thumbnail_factory_init (*argc, *argv); - capplet_init (context, argc, argv); - activate_settings_daemon (); -@@ -208,6 +210,7 @@ - - /* start the mainloop */ - gtk_main (); -+ gdk_threads_leave (); - - /* free stuff */ - g_free (data); ---- gnome-control-center-2.28.1/capplets/appearance/theme-installer.c 2009-08-24 06:54:41.000000000 -0400 -+++ foo/capplets/appearance/theme-installer.c 2010-02-15 12:29:59.573014558 -0500 -@@ -613,6 +613,7 @@ - transfer_done_cb (GtkWidget *dialog, - TransferData *tdata) - { -+ gdk_threads_enter (); - /* XXX: path should be on the local filesystem by now? */ - - if (dialog != NULL) { -@@ -623,6 +624,8 @@ - - g_free (tdata->path); - g_free (tdata); -+ -+ gdk_threads_leave (); - } - - void