aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/component')
-rw-r--r--addressbook/gui/component/addressbook-config.c6
-rw-r--r--addressbook/gui/component/addressbook-migrate.c16
-rw-r--r--addressbook/gui/component/addressbook-view.c4
3 files changed, 13 insertions, 13 deletions
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 133512d2c4..320a17e386 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -425,8 +425,8 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
supported_bases_table = glade_xml_get_widget (gui, "supported-bases-table");
gtk_widget_show_all (supported_bases_table);
- table = g_object_get_data((GObject *)supported_bases_table, "table");
- model = (GtkListStore *)gtk_tree_view_get_model(table);
+ table = g_object_get_data (G_OBJECT (supported_bases_table), "table");
+ model = GTK_LIST_STORE (gtk_tree_view_get_model(table));
selection = gtk_tree_view_get_selection (table);
g_signal_connect (selection, "changed", G_CALLBACK (search_base_selection_model_changed), dialog);
search_base_selection_model_changed (selection, dialog);
@@ -1018,7 +1018,7 @@ eabc_commit(EConfig *ec, GSList *items, void *data)
d(printf("committing addressbook changes\n"));
/* these api's kinda suck */
- xml = xmlNewNode(NULL, "dummy");
+ xml = xmlNewNode(NULL, (const unsigned char *)"dummy");
e_source_dump_to_xml_node(sdialog->source, xml);
e_source_update_from_xml_node(sdialog->original_source, xml->children, NULL);
xmlFreeNode(xml);
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 18a58a032a..2c9d621bb8 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -592,7 +592,7 @@ get_integer_child (xmlNode *node,
return defval;
xml_string = xmlNodeListGetString (node->doc, p, 1);
- retval = atoi (xml_string);
+ retval = atoi ((char *)xml_string);
xmlFree (xml_string);
return retval;
@@ -617,7 +617,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
return FALSE;
root = xmlDocGetRootElement (doc);
- if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
+ if (root == NULL || strcmp ((const char *)root->name, "addressbooks") != 0) {
xmlFreeDoc (doc);
return FALSE;
}
@@ -625,7 +625,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
/* count the number of servers, so we can give progress */
num_contactservers = 0;
for (child = root->children; child; child = child->next) {
- if (!strcmp (child->name, "contactserver")) {
+ if (!strcmp ((const char *)child->name, "contactserver")) {
num_contactservers++;
}
}
@@ -635,7 +635,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
servernum = 0;
for (child = root->children; child; child = child->next) {
- if (!strcmp (child->name, "contactserver")) {
+ if (!strcmp ((const char *)child->name, "contactserver")) {
char *port, *host, *rootdn, *scope, *authmethod, *ssl;
char *emailaddr, *binddn, *limitstr;
int limit;
@@ -749,14 +749,14 @@ migrate_completion_folders (MigrationContext *context)
dialog_set_folder_name (context, _("Autocompletion Settings"));
root = xmlDocGetRootElement (doc);
- if (root == NULL || strcmp (root->name, "EvolutionFolderList") != 0) {
+ if (root == NULL || strcmp ((const char *)root->name, "EvolutionFolderList") != 0) {
xmlFreeDoc (doc);
return FALSE;
}
for (child = root->children; child; child = child->next) {
- if (!strcmp (child->name, "folder")) {
- char *physical_uri = e_xml_get_string_prop_by_name (child, "physical-uri");
+ if (!strcmp ((const char *)child->name, "folder")) {
+ char *physical_uri = e_xml_get_string_prop_by_name (child, (const unsigned char *)"physical-uri");
ESource *source = NULL;
/* if the physical uri is file://...
@@ -782,7 +782,7 @@ migrate_completion_folders (MigrationContext *context)
source = e_source_list_peek_source_by_uid (context->source_list, uid);
}
else {
- char *name = e_xml_get_string_prop_by_name (child, "display-name");
+ char *name = e_xml_get_string_prop_by_name (child, (const unsigned char *)"display-name");
source = get_source_by_name (context->source_list, name);
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 9a399a066f..ebf20e06d6 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1171,7 +1171,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
GtkTreeIter iter;
gboolean success = FALSE;
EBook *source_book, *target_book;
- MergeContext *merge_context;
+ MergeContext *merge_context = NULL;
GList *contactlist;
AddressbookView *view;
EABView *v;
@@ -1197,7 +1197,7 @@ selector_tree_drag_data_received (GtkWidget *widget,
}
e_book_open (target_book, FALSE, NULL);
- eab_book_and_contact_list_from_string (data->data, &source_book, &contactlist);
+ eab_book_and_contact_list_from_string ((char *)data->data, &source_book, &contactlist);
view = (AddressbookView *) user_data;
v = get_current_view (view);