jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #17184: addressbook: use empty string for deprecated uri field

Browse Source 
We should only use one form of our book_data_t struct, as it is being
loaded from the plugin into gnome.
This commit is contained in:
Tristan Matthews
2012-11-07 16:22:36 -05:00
parent 4404f0ea16
commit 62f8c7c6e7
4 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnome/src/contacts/addressbook.h
View File

@ -61,7 +61,6 @@ typedef struct {
gchar *uri; gchar *uri;
gchar *name; gchar *name;
gboolean active; gboolean active;
gboolean isdefault;
} book_data_t; } book_data_t;
typedef struct _AddressBook_Config { typedef struct _AddressBook_Config {

7
gnome/src/contacts/searchbar.c
View File

@ -386,11 +386,8 @@ GtkWidget* contacts_searchbar_new()
gtk_list_store_set(liststore, &iter, 0, book_data->name, -1); gtk_list_store_set(liststore, &iter, 0, book_data->name, -1);
if (book_data->isdefault) { activeIter = iter;
activeIter = iter; activeIsSet = TRUE;
activeIsSet = TRUE;
}
count++; count++;
} }
} }

9
plugins/addressbook/evolution/addressbook.h
View File

@ -60,21 +60,12 @@ typedef struct _Hit {
/** /**
* Book structure for "outside world" * Book structure for "outside world"
*/ */
#if EDS_CHECK_VERSION(3,5,3)
typedef struct {
gchar *uid;
gchar *name;
gboolean active;
} book_data_t;
#else
typedef struct { typedef struct {
gchar *uid; gchar *uid;
gchar *uri; gchar *uri;
gchar *name; gchar *name;
gboolean active; gboolean active;
gboolean isdefault;
} book_data_t; } book_data_t;
#endif
typedef struct _AddressBook_Config { typedef struct _AddressBook_Config {
// gint64: a signed integer guaranteed to be 64 bits on all platforms // gint64: a signed integer guaranteed to be 64 bits on all platforms

47
plugins/addressbook/evolution/eds.c
View File

@ -296,14 +296,10 @@ init_eds()
for (GSList *iter = books_data; iter != NULL; iter = iter->next) { for (GSList *iter = books_data; iter != NULL; iter = iter->next) {
book_data_t *book_data = (book_data_t *) iter->data; book_data_t *book_data = (book_data_t *) iter->data;
#if EDS_CHECK_VERSION(3,5,3) #if !EDS_CHECK_VERSION(3,5,3)
{ current_uri = book_data->uri;
#else
if (book_data->isdefault) {
current_uri = book_data->uri;
#endif #endif
current_uid = book_data->uid; current_uid = book_data->uid;
}
} }
g_static_mutex_unlock(&books_data_mutex); g_static_mutex_unlock(&books_data_mutex);
@ -317,9 +313,7 @@ free_books_data(GSList *list)
g_free(book_data->name); g_free(book_data->name);
g_free(book_data->uid); g_free(book_data->uid);
#if !EDS_CHECK_VERSION(3,5,3)
g_free(book_data->uri); g_free(book_data->uri);
#endif
} }
return NULL; return NULL;
} }
@ -335,6 +329,7 @@ create_book_data_from_source(ESource *source)
book_data_t *book_data = g_new0(book_data_t, 1); book_data_t *book_data = g_new0(book_data_t, 1);
book_data->active = e_source_get_enabled(source); book_data->active = e_source_get_enabled(source);
book_data->name = g_strdup(e_source_get_display_name(source)); book_data->name = g_strdup(e_source_get_display_name(source));
book_data->uri = g_strdup(""); // No longer used
book_data->uid = g_strdup(e_source_get_uid(source)); book_data->uid = g_strdup(e_source_get_uid(source));
return book_data; return book_data;
} }
@ -384,8 +379,6 @@ create_book_data_from_source(ESource *source, ESourceGroup *group)
book_data->name = g_strdup(e_source_peek_name(source)); book_data->name = g_strdup(e_source_peek_name(source));
book_data->uid = g_strdup(e_source_peek_uid(source)); book_data->uid = g_strdup(e_source_peek_uid(source));
const gchar *prop = e_source_get_property(source, "default");
book_data->isdefault = (prop && !strcmp(prop, "true"));
book_data->uri = g_strconcat(e_source_group_peek_base_uri(group), e_source_peek_relative_uri(source), NULL); book_data->uri = g_strconcat(e_source_group_peek_base_uri(group), e_source_peek_relative_uri(source), NULL);
return book_data; return book_data;
} }
@ -432,37 +425,29 @@ determine_default_addressbook()
{ {
g_static_mutex_lock(&books_data_mutex); g_static_mutex_lock(&books_data_mutex);
gboolean default_found = FALSE; /* Just grabbing first addressbook as default */
for (GSList *elm = books_data; elm ; elm = g_slist_next(elm)) {
book_data_t *book_data = elm->data;
#if !EDS_CHECK_VERSION(3,5,3)
current_uri = book_data->uri;
#endif
current_uid = book_data->uid;
break;
}
for (GSList *elm = books_data; elm ; elm = g_slist_next(elm)) { for (GSList *elm = books_data; elm ; elm = g_slist_next(elm)) {
book_data_t *book_data = elm->data; book_data_t *book_data = elm->data;
#if EDS_CHECK_VERSION(3,5,3) if (book_data->active) {
{ #if !EDS_CHECK_VERSION(3,5,3)
#else /* < EDS 3.5.3 */
if (book_data->isdefault) {
current_uri = book_data->uri; current_uri = book_data->uri;
#endif #endif
current_uid = book_data->uid; current_uid = book_data->uid;
default_found = TRUE;
break; break;
} }
} }
if (!default_found)
for (GSList *elm = books_data; elm ; elm = g_slist_next(elm)) {
book_data_t *book_data = elm->data;
if (book_data->active) {
#if !EDS_CHECK_VERSION(3,5,3)
book_data->isdefault = TRUE;
current_uri = book_data->uri;
#endif
current_uid = book_data->uid;
break;
}
}
g_static_mutex_unlock(&books_data_mutex); g_static_mutex_unlock(&books_data_mutex);
} }