← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to libempathy/empathy-gsettings.h

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy/empathy-gsettings.h
29
29
#define EMPATHY_PREFS_USE_CONN                     "use-conn"
30
30
#define EMPATHY_PREFS_AUTOCONNECT                  "autoconnect"
31
31
#define EMPATHY_PREFS_AUTOAWAY                     "autoaway"
32
 
#define EMPATHY_PREFS_IMPORT_ASKED                 "import-asked"
33
32
#define EMPATHY_PREFS_BUTTERFLY_LOGS_MIGRATED      "butterfly-logs-migrated"
34
33
#define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER "file-transfer-default-folder"
35
34
 
71
70
#define EMPATHY_PREFS_UI_SHOW_AVATARS              "show-avatars"
72
71
#define EMPATHY_PREFS_UI_SHOW_PROTOCOLS            "show-protocols"
73
72
#define EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST      "compact-contact-list"
74
 
#define EMPATHY_PREFS_UI_USE_LIBINDICATE           "use-libindicate"
75
73
#define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     "chat-window-paned-pos"
76
74
#define EMPATHY_PREFS_UI_SHOW_OFFLINE              "show-offline"
77
75
 
88
86
#define EMPATHY_PREFS_LOCATION_RESOURCE_GPS        "resource-gps"
89
87
#define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     "reduce-accuracy"
90
88
 
91
 
#define EMPATHY_PREFS_ACCOUNTS_SCHEMA EMPATHY_PREFS_SCHEMA ".accounts"
92
 
 
93
89
#define EMPATHY_PREFS_LOGGER_SCHEMA "org.freedesktop.Telepathy.Logger"
94
90
#define EMPATHY_PREFS_LOGGER_ENABLED "enabled"
95
91
 
 
92
#define EMPATHY_PREFS_DESKTOP_INTERFACE_SCHEMA "org.gnome.desktop.interface"
 
93
#define EMPATHY_PREFS_DESKTOP_INTERFACE_DOCUMENT_FONT_NAME "document-font-name"
 
94
 
96
95
G_END_DECLS
97
96
 
98
97
#endif /* __EMPATHY_GSETTINGS_H__ */