jeena/gnome-contacts
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fix retrieving Personal evo group name

Browse source 
The code building the domain was always building odd (unstable)
versions, and was not initializing the localedir appropriately.
This resulted in "Personal" instead of the right group name and
therefore did not recognize the system group.

https://bugzilla.gnome.org/show_bug.cgi?id=674347
(cherry picked from commit dfda1ee01e)

Conflicts:

	src/main.vala
This commit is contained in:
Giovanni Campagna 2012-04-18 20:01:08 +02:00 • committed by Alexander Larsson
parent a2c5752945
commit 0ce0d3f236
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/contacts-esd-setup.c
View file

@ -621,9 +621,14 @@ eds_personal_google_group_name (void)
char *domain;
if (name == NULL) {
domain = g_strdup_printf ("evolution-data-server-%d.%d\n",
domain = g_strdup_printf ("evolution-data-server-%d.%d",
EDS_MAJOR_VERSION,
EDS_MINOR_VERSION + ((EDS_MINOR_VERSION + 1) % 2));
EDS_MINOR_VERSION + ((EDS_MINOR_VERSION) % 2));
/* Let's assume e-d-s is installed in the same prefix as gnome-contacts
(which works for system and jhbuild setups) */
bindtextdomain (domain, LOCALEDIR);
name = dgettext (domain, "Personal");
g_free (domain);
}

3
src/main.vala
View file

@ -21,11 +21,12 @@ using Contacts;
public static int
main (string[] args) {
Notify.init (_("Contacts"));
Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
Intl.textdomain (Config.GETTEXT_PACKAGE);
Notify.init (_("Contacts"));
Gtk.init (ref args);
var app = new App ();