From af52113f2f8b934664a233a3a5dd1544dd347638 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 3 Jun 2007 03:10:56 +0000 Subject: Fix compiler warnings in addressbook folder. (#440272) svn path=/trunk/; revision=33630 --- addressbook/gui/widgets/e-addressbook-view.c | 16 ++++++++-------- addressbook/gui/widgets/e-minicard-view.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 2 +- addressbook/gui/widgets/eab-contact-display.c | 6 +++--- addressbook/gui/widgets/gal-view-minicard.c | 16 +++++++++------- 5 files changed, 23 insertions(+), 21 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 758a3af16f..3174e5f21f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1148,7 +1148,7 @@ table_drag_data_get (ETable *table, gtk_selection_data_set (selection_data, selection_data->target, 8, - value, strlen (value)); + (guchar *)value, strlen (value)); g_free (value); break; } @@ -1160,7 +1160,7 @@ table_drag_data_get (ETable *table, gtk_selection_data_set (selection_data, selection_data->target, 8, - value, strlen (value)); + (guchar *)value, strlen (value)); g_free (value); break; } @@ -1663,7 +1663,7 @@ make_suboptions (EABView *view) const char *category = g_list_nth_data (master_list, i); subitems[i+1].search.id = i+1; subitems[i+1].search.text = g_strdup (category); - subitems[i+1].image = e_categories_get_icon_file_for (category); + subitems[i+1].image = (char *)e_categories_get_icon_file_for (category); } subitems[N+1].search.id = -1; @@ -1861,11 +1861,11 @@ eab_view_delete_selection(EABView *view, gboolean is_delete) GList *list, *l; gboolean plural = FALSE, is_list = FALSE; EContact *contact; - ETable *etable; + ETable *etable = NULL; EMinicardView *card_view; - ESelectionModel *selection_model; + ESelectionModel *selection_model = NULL; char *name = NULL; - gint row, select; + gint row = 0, select; list = get_selected_contacts (view); contact = list->data; @@ -1977,7 +1977,7 @@ selection_get (GtkWidget *invisible, value = eab_contact_list_to_string (view->clipboard_contacts); gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING, - 8, value, strlen (value)); + 8, (guchar *)value, strlen (value)); g_free (value); } @@ -2011,7 +2011,7 @@ selection_received (GtkWidget *invisible, memcpy (str, selection_data->data, selection_data->length); contact_list = eab_contact_list_from_string (str); } else - contact_list = eab_contact_list_from_string (selection_data->data); + contact_list = eab_contact_list_from_string ((char *)selection_data->data); for (l = contact_list; l; l = l->next) { EContact *contact = l->data; diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 8ced89cb03..fc999d3f51 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -94,7 +94,7 @@ e_minicard_view_drag_data_get(GtkWidget *widget, gtk_selection_data_set (selection_data, selection_data->target, 8, - value, strlen (value)); + (unsigned char *)value, strlen (value)); g_free (value); break; } @@ -108,7 +108,7 @@ e_minicard_view_drag_data_get(GtkWidget *widget, gtk_selection_data_set (selection_data, selection_data->target, 8, - value, strlen (value)); + (unsigned char *)value, strlen (value)); g_free (value); break; } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index f7852ca86d..58897f3932 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -838,7 +838,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i GnomeCanvasItem *new_item; GnomeCanvasGroup *group; EMinicardField *minicard_field; - const char *name; + char *name; char *string; GList *l, *le; int count =0; diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index f5bc9a0f71..c45ac78e7b 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -154,7 +154,7 @@ eab_selection_get(GtkWidget *widget, GtkSelectionData *data, guint info, guint t if (p->selection_uri == NULL) return; - gtk_selection_data_set(data, data->target, 8, p->selection_uri, strlen(p->selection_uri)); + gtk_selection_data_set(data, data->target, 8, (guchar *)p->selection_uri, strlen(p->selection_uri)); } static void @@ -233,7 +233,7 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, if (!photo) photo = e_contact_get (display->priv->contact, E_CONTACT_LOGO); - gtk_html_stream_write (handle, photo->data.inlined.data, photo->data.inlined.length); + gtk_html_stream_write (handle, (char *)photo->data.inlined.data, photo->data.inlined.length); gtk_html_end (html, handle, GTK_HTML_STREAM_OK); @@ -512,7 +512,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) for (l = email_list, al=email_attr_list; l && al; l = l->next, al = al->next) { #ifdef HANDLE_MAILTO_INTERNALLY char *html = e_text_to_html (l->data, 0); - char *attr_str = get_email_location ((EVCardAttribute *) al->data); + char *attr_str = (char *)get_email_location ((EVCardAttribute *) al->data); g_string_append_printf (accum, "%s%s (%s)", nl, email_num, html, attr_str?attr_str:""); email_num ++; g_free (html); diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 6239ead080..dc32f74fc5 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -31,7 +31,7 @@ gal_view_minicard_load (GalView *view, doc = e_xml_parse_file (filename); if (doc) { xmlNode *root = xmlDocGetRootElement(doc); - GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150); + GAL_VIEW_MINICARD (view)->column_width = e_xml_get_double_prop_by_name_with_default (root, (const unsigned char *)"column_width", 150); xmlFreeDoc(doc); } } @@ -43,9 +43,9 @@ gal_view_minicard_save (GalView *view, xmlDoc *doc; xmlNode *root; - doc = xmlNewDoc("1.0"); - root = xmlNewNode (NULL, "EMinicardViewState"); - e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_MINICARD (view)->column_width); + doc = xmlNewDoc((const unsigned char *)"1.0"); + root = xmlNewNode (NULL, (const unsigned char *)"EMinicardViewState"); + e_xml_set_double_prop_by_name (root, (const unsigned char *)"column_width", GAL_VIEW_MINICARD (view)->column_width); xmlDocSetRootElement(doc, root); e_xml_save_file (filename, doc); xmlFreeDoc(doc); @@ -198,10 +198,12 @@ column_width_changed (EMinicardViewWidget *w, double width, EABView *address_vie gal_view_changed(GAL_VIEW(view)); } - scrolled_window = GTK_SCROLLED_WINDOW(address_view->widget); + scrolled_window = GTK_SCROLLED_WINDOW (address_view->widget); adj = gtk_scrolled_window_get_hadjustment (scrolled_window); - adj_new = gtk_adjustment_new(adj->value, adj->lower, adj->upper, adj->page_size, adj->page_increment,adj->page_size); - gtk_scrolled_window_set_hadjustment(scrolled_window, adj_new); + adj_new = GTK_ADJUSTMENT (gtk_adjustment_new (adj->value, adj->lower, adj->upper, + adj->page_size, adj->page_increment, + adj->page_size)); + gtk_scrolled_window_set_hadjustment (scrolled_window, adj_new); } void -- cgit v1.2.3