← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to debian/patches/00_git_dont_erase_background_xml.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/00_git_dont_erase_background_xml.patch
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);