/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-2.32.1-erase-background.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Sun Mar 27 16:45:12 2011 UTC (3 years, 8 months ago) by pacho
Branch: MAIN
Revision bump using URL handlers for browser and mailer applications to be compatible with glib-2.28, not showing twice the configured background if it is a symlink to a known background, not erasing backgrounds.xml under some circumstances (bug #344335 by Matthew Turnbull). Remove old.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

1 pacho 1.1 diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance-desktop.c gnome-control-center-2.32.0.new/capplets/appearance/appearance-desktop.c
2     --- a/capplets/appearance/appearance-desktop.c 2010-09-21 08:54:55.000000000 -0400
3     +++ b/capplets/appearance/appearance-desktop.c 2010-11-05 20:51:53.867234128 -0400
4     @@ -1225,6 +1225,7 @@ desktop_init (AppearanceData *data,
5     GtkCellRenderer *cr;
6     char *url;
7    
8     + data->wp_xml_list_loaded = FALSE;
9     data->wp_update_gconf = TRUE;
10    
11     data->wp_uris = NULL;
12     diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance.h gnome-control-center-2.32.0.new/capplets/appearance/appearance.h
13     --- a/capplets/appearance/appearance.h 2010-09-21 08:54:55.000000000 -0400
14     +++ b/capplets/appearance/appearance.h 2010-11-05 20:51:58.050214779 -0400
15     @@ -41,6 +41,7 @@ typedef struct
16    
17     /* desktop */
18     GHashTable *wp_hash;
19     + gboolean wp_xml_list_loaded;
20     gboolean wp_update_gconf;
21     GtkIconView *wp_view;
22     GtkTreeModel *wp_model;
23     diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/gnome-wp-xml.c gnome-control-center-2.32.0.new/capplets/appearance/gnome-wp-xml.c
24     --- a/capplets/appearance/gnome-wp-xml.c 2010-09-21 08:54:55.000000000 -0400
25     +++ b/capplets/appearance/gnome-wp-xml.c 2010-11-05 20:54:03.198634367 -0400
26     @@ -378,6 +378,8 @@ void gnome_wp_xml_load_list (AppearanceD
27     gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data);
28    
29     gnome_wp_load_legacy (data);
30     +
31     + data->wp_xml_list_loaded = TRUE;
32     }
33    
34     static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item,
35     @@ -394,6 +396,11 @@ void gnome_wp_xml_save_list (AppearanceD
36     GSList * list = NULL;
37     gchar * wpfile;
38    
39     + if (!data->wp_xml_list_loaded) {
40     + g_hash_table_destroy (data->wp_hash);
41     + return;
42     + }
43     +
44     g_hash_table_foreach (data->wp_hash,
45     (GHFunc) gnome_wp_list_flatten, &list);
46     g_hash_table_destroy (data->wp_hash);

  ViewVC Help
Powered by ViewVC 1.1.20