From 6a557ef8fd8fb37af345b0f092f8419572bee1dd Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Fri, 27 Jan 2006 15:41:52 +0000 Subject: reviewed by: Harish Krishnaswamy 2006-01-27 Kjartan Maraas reviewed by: Harish Krishnaswamy * gui/component/addressbook-component.c: (impl_requestCreateItem): Remove unused bits. * gui/component/addressbook-config.c: (eabc_general_type), (eabc_general_offline): Same here. * gui/component/addressbook-migrate.c: Remove unused static function. * gui/component/addressbook-view.c: (selector_tree_drag_motion): Remove unused static function and init uninitialized var. * gui/contact-editor/e-contact-editor-address.c: (fill_in_countries): Return early if setlocale() fails. * gui/contact-editor/e-contact-editor.c: (file_as_get_style), (extract_email), (extract_phone), (sensitize_phone_types), (extract_im), (sensitize_im_types), (init_simple): Mark some arrays static, remove unused variables, fix gcc warnings * gui/contact-list-editor/e-contact-list-editor.c: (fill_in_info): Remove unused var. * gui/merging/eab-contact-compare.c: (eab_contact_compare_name): Remove unused static function and unused vars. * gui/search/e-addressbook-search-dialog.c: (eab_search_dialog_dispose): Remove unused vars. * gui/widgets/e-addressbook-model.c: (get_view): Add comment. * gui/widgets/e-addressbook-view.c: (eab_view_class_init), (eab_view_delete_selection): Remove unused var * gui/widgets/e-addressbook-view.h: Remove extra semi-colon. * gui/widgets/e-minicard-label.c: (e_minicard_label_unrealize): Remove unused var. * gui/widgets/e-minicard.c: (e_minicard_unrealize), (e_minicard_event), (add_field), (remodel), (e_minicard_reflow): Remove unused vars. s/if/ifdef in some places, use passed in parameter instead of redeclaring the thing locally. * gui/widgets/eab-contact-display.c: (accum_address), (eab_contact_display_render_compact): s/if/ifdef. * gui/widgets/eab-gui-util.c: (eab_select_source): Comment out unused var. * gui/widgets/eab-popup-control.c: (eab_popup_control_cleanup): s/if/ifdef * printing/e-contact-print-style-editor.c: (e_contact_print_style_editor_class_init), (e_contact_print_style_editor_set_arg), (e_contact_print_style_editor_get_arg): Remove unused vars. * util/eab-book-util.c: s/if/ifdef svn path=/trunk/; revision=31327 --- addressbook/gui/widgets/e-addressbook-model.c | 1 + addressbook/gui/widgets/e-addressbook-view.c | 6 ++---- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/e-minicard-label.c | 4 ---- addressbook/gui/widgets/e-minicard.c | 13 +++---------- addressbook/gui/widgets/eab-contact-display.c | 4 ++-- addressbook/gui/widgets/eab-gui-util.c | 6 +++--- addressbook/gui/widgets/eab-popup-control.c | 2 +- 8 files changed, 13 insertions(+), 25 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 387f467158..edd824302b 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -488,6 +488,7 @@ book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointe static void get_view (EABModel *model) { + /* Should this be checked somehow? */ gboolean success; if (model->book && model->query) { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index e7db20275d..da7f1ad14b 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -208,10 +208,8 @@ static void eab_view_class_init (EABViewClass *klass) { GObjectClass *object_class; - GtkWidgetClass *widget_class; object_class = G_OBJECT_CLASS(klass); - widget_class = GTK_WIDGET_CLASS(klass); parent_class = gtk_type_class (PARENT_TYPE); @@ -1908,7 +1906,7 @@ eab_view_delete_selection(EABView *view, gboolean is_delete) GList *ids = NULL; for (l=list;l;l=g_list_next(l)) { - EContact *contact = l->data; + contact = l->data; ids = g_list_prepend (ids, (char*)e_contact_get_const (contact, E_CONTACT_UID)); } @@ -1924,7 +1922,7 @@ eab_view_delete_selection(EABView *view, gboolean is_delete) } else { for (l=list;l;l=g_list_next(l)) { - EContact *contact = l->data; + contact = l->data; /* Remove the card. */ /* XXX no callback specified... ugh */ e_book_async_remove_contact (view->book, diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 28fe6831bd..a4d80c3062 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -159,6 +159,6 @@ gboolean eab_view_can_move_to_folder (EABView *view); struct _EABMenuTargetSelect *eab_view_get_menu_target (EABView *view, struct _EABMenu *menu); -G_END_DECLS; +G_END_DECLS #endif /* __EAB_VIEW_H__ */ diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 23021c31e1..f9b5dcbbe7 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -336,10 +336,6 @@ e_minicard_label_realize (GnomeCanvasItem *item) static void e_minicard_label_unrealize (GnomeCanvasItem *item) { - EMinicardLabel *e_minicard_label; - - e_minicard_label = E_MINICARD_LABEL (item); - if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item); } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index b5b941be1d..fbb6956b32 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -515,10 +515,6 @@ e_minicard_realize (GnomeCanvasItem *item) static void e_minicard_unrealize (GnomeCanvasItem *item) { - EMinicard *e_minicard; - - e_minicard = E_MINICARD (item); - if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item); } @@ -573,10 +569,8 @@ static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event) { EMinicard *e_minicard; - GtkWidget *canvas; e_minicard = E_MINICARD (item); - canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas); switch( event->type ) { case GDK_FOCUS_CHANGE: @@ -793,7 +787,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) NULL ); -#if notyet +#ifdef notyet g_object_set(E_MINICARD_LABEL(new_item)->field, "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field), NULL); @@ -895,8 +889,7 @@ remodel( EMinicard *e_minicard ) } else { e_minicard_field_destroy(minicard_field); } - list = g_list_remove_link(list, this_list); - g_list_free_1(this_list); + list = g_list_delete_link(list, this_list); g_free(string); } else { char *string; @@ -941,7 +934,7 @@ e_minicard_reflow( GnomeCanvasItem *item, int flags ) for(list = e_minicard->fields; list; list = g_list_next(list)) { EMinicardField *field = E_MINICARD_FIELD(list->data); - GnomeCanvasItem *item = field->label; + item = field->label; g_object_get (item, "height", &text_height, NULL); diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 48725d6fcc..4d7b39debe 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -194,7 +194,7 @@ accum_address (GString *gstr, EContact *contact, const char *html_label, EContac if (label) { char *html = e_text_to_html (label, E_TEXT_TO_HTML_CONVERT_NL); -#if mapping_works +#ifdef mapping_works g_string_append_printf (gstr, "%s:
%s%s", html_label, _("(map)"), html); #else g_string_append_printf (gstr, "%s:%s", html_label, html); @@ -548,7 +548,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac for (l = email_list; l; l = l->next) { if (l->data) { - char *html = e_text_to_html (l->data, 0); + html = e_text_to_html (l->data, 0); gtk_html_stream_printf (html_stream, "%s, ", html); g_free (html); } diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 416e613ecc..835a366467 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -446,7 +446,7 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select GtkWidget *dialog; GtkWidget *ok_button; GtkWidget *cancel_button; - GtkWidget *label; + /* GtkWidget *label; */ GtkWidget *selector; GtkWidget *scrolled_window; gint response; @@ -463,7 +463,7 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); gtk_widget_set_sensitive (ok_button, FALSE); - //label = gtk_label_new (message); + /* label = gtk_label_new (message); */ selector = e_source_selector_new (source_list); e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE); @@ -480,7 +480,7 @@ eab_select_source (const gchar *title, const gchar *message, const gchar *select gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (scrolled_window), selector); - //gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 4); + /* gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, FALSE, 4); */ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scrolled_window, TRUE, TRUE, 4); gtk_widget_show_all (dialog); diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index e46c88b0ec..b682e189a2 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -94,7 +94,7 @@ eab_popup_control_cleanup (EABPopupControl *pop) } if (pop->query_tag) { -#if notyet +#ifdef notyet e_book_simple_query_cancel (pop->book, pop->query_tag); #endif pop->query_tag = 0; -- cgit v1.2.3