← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gconf/oneiric-proposed

« back to all changes in this revision

Viewing changes to gsettings/gconfsettingsbackend.c

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort, Josselin Mouette, Sjoerd Simons, Emilio Pozuelo Monfort
  • Date: 2010-12-06 00:53:14 UTC
  • mfrom: (1.1.25 upstream)
  • mto: (7.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: james.westby@ubuntu.com-20101206005314-uz89yke6r1xfw504
Tags: 2.32.1-1
http://bugs.debian.org/599032
http://bugs.debian.org/599049
http://bugs.debian.org/599125
http://bugs.debian.org/599198
http://bugs.debian.org/599393
http://bugs.debian.org/599683
http://bugs.debian.org/599854
http://bugs.debian.org/600899
[ Josselin Mouette ]
* Include patch-translations.mk, bump build-depends accordingly.
* Include 03_error_message.patch in POTFILES.in.
* pt_BR.po: Brazilian Portuguese translation. Closes: #599032.
* fr.po: French translation by Christian Perrier. Closes: #599049.
* da.po: Danish translation by Joe Hansen. Closes: #599125.
* cs.po: Czech translation by Michal Simunek. Closes: #599198.
* update-gconf-defaults: patch from Ubuntu to deal with broken 
  symlinks. Closes: #599393. Thanks Michael Vogt.
* de.po: German translation by Helge Kreutzmann. Closes: #599683.
* sv.po: Swedish translation by Martin Bagge. Closes: #599854.
* 04_manpage.patch: patch from A. Costa. Fixes typos in the manual 
  page. Closes: #600899.

[ Sjoerd Simons ]
* New upstream release
* Bump gobject-introspection to the lastest version to generate the most
  recent .gir version
* debian/patches/03_error_message.patch
  + Removed, merged upstream
* debian/rules:
  + Specify compilation with gtk2

[ Emilio Pozuelo Monfort ]
* Switch to source format 3.0 (quilt).
* debian/patches/*:
  - Updated to apply cleanly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gsettings/gconfsettingsbackend.c
726
726
}
727
727
 
728
728
static gboolean
729
 
gconf_settings_backend_write_keys (GSettingsBackend *backend,
 
729
gconf_settings_backend_write_tree (GSettingsBackend *backend,
730
730
                                   GTree            *tree,
731
731
                                   gpointer          origin_tag)
732
732
{
783
783
    g_settings_backend_changed (backend, key, origin_tag);
784
784
}
785
785
 
786
 
static void
787
 
gconf_settings_backend_reset_path (GSettingsBackend *backend,
788
 
                                   const gchar      *path,
789
 
                                   gpointer          origin_tag)
790
 
{
791
 
  GConfSettingsBackend *gconf = GCONF_SETTINGS_BACKEND (backend);
792
 
 
793
 
  /* We have no way to know if it was completely successful or if it
794
 
   * completely failed, or if only some keys were unset, so we just send
795
 
   * one big changed signal. */
796
 
  gconf_client_recursive_unset (gconf->priv->client, path, 0, NULL);
797
 
  g_settings_backend_path_changed (backend, path, origin_tag);
798
 
}
799
 
 
800
786
static gboolean
801
787
gconf_settings_backend_get_writable (GSettingsBackend *backend,
802
788
                                     const gchar      *name)
922
908
 
923
909
  backend_class->read = gconf_settings_backend_read;
924
910
  backend_class->write = gconf_settings_backend_write;
925
 
  backend_class->write_keys = gconf_settings_backend_write_keys;
 
911
  backend_class->write_tree = gconf_settings_backend_write_tree;
926
912
  backend_class->reset = gconf_settings_backend_reset;
927
 
  backend_class->reset_path = gconf_settings_backend_reset_path;
928
913
  backend_class->get_writable = gconf_settings_backend_get_writable;
929
914
  backend_class->subscribe = gconf_settings_backend_subscribe;
930
915
  backend_class->unsubscribe = gconf_settings_backend_unsubscribe;