aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog43
-rw-r--r--addressbook/gui/component/addressbook-component.c4
-rw-r--r--addressbook/gui/component/addressbook-config.c4
-rw-r--r--addressbook/gui/component/addressbook-migrate.c24
-rw-r--r--addressbook/gui/component/addressbook-view.c11
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-address.c19
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c28
-rw-r--r--addressbook/gui/contact-list-editor/e-contact-list-editor.c2
-rw-r--r--addressbook/gui/merging/eab-contact-compare.c28
-rw-r--r--addressbook/gui/search/e-addressbook-search-dialog.c4
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.c1
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c6
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.h2
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c4
-rw-r--r--addressbook/gui/widgets/e-minicard.c13
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c4
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c6
-rw-r--r--addressbook/gui/widgets/eab-popup-control.c2
-rw-r--r--addressbook/printing/e-contact-print-style-editor.c10
-rw-r--r--addressbook/util/eab-book-util.c2
20 files changed, 83 insertions, 134 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6632a81126..c0c7a3b84b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,46 @@
+2006-01-27 Kjartan Maraas <kmaraas@gnome.org>
+
+ reviewed by: Harish Krishnaswamy <kharish@novell.com>
+
+ * 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
+
2006-12-7 M Victor Aloysius J <victoraloy@gmail.com>
* gui/contact-editor/e-contact-editor.c (style_makes_sense):
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index b1928669c2..9c3fae50c5 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -282,12 +282,8 @@ impl_requestCreateItem (PortableServer_Servant servant,
const CORBA_char *item_type_name,
CORBA_Environment *ev)
{
- AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant));
- AddressbookComponentPrivate *priv;
EBook *book;
- priv = addressbook_component->priv;
-
if (!item_type_name ||
(strcmp (item_type_name, "address_book") &&
strcmp (item_type_name, "contact") &&
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index b8822848f7..c7605e1163 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -521,7 +521,7 @@ eabc_general_type(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
GtkTreeIter iter;
GSList *l;
GtkWidget *w, *label;
- int i, row;
+ int i, row = 0;
if (old)
return old;
@@ -622,7 +622,6 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
AddressbookSourceDialog *sdialog = data;
GtkWidget *offline_setting;
const char *offline_sync;
- int row;
gboolean is_local_book;
is_local_book = g_str_has_prefix (e_source_group_peek_base_uri (sdialog->source_group), "file:");
@@ -630,7 +629,6 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
if (old)
return old;
else {
- row = ((GtkTable*)parent)->nrows;
offline_setting = gtk_check_button_new_with_label (N_("Copy book content locally for offline operation"));
gtk_widget_show (offline_setting);
gtk_container_add (GTK_CONTAINER (parent), offline_setting);
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 5f56b24dfe..c4516c4b0a 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -220,30 +220,6 @@ get_source_name (ESourceGroup *group, const char *path)
}
static void
-add_to_notes (EContact *contact, EContactField field)
-{
- const gchar *old_text;
- const gchar *field_text;
- gchar *new_text;
-
- old_text = e_contact_get_const (contact, E_CONTACT_NOTE);
- if (old_text && strstr (old_text, e_contact_pretty_name (field)))
- return;
-
- field_text = e_contact_get_const (contact, field);
- if (!field_text || !*field_text)
- return;
-
- new_text = g_strdup_printf ("%s%s%s: %s",
- old_text ? old_text : "",
- old_text && *old_text &&
- *(old_text + strlen (old_text) - 1) != '\n' ? "\n" : "",
- e_contact_pretty_name (field), field_text);
- e_contact_set (contact, E_CONTACT_NOTE, new_text);
- g_free (new_text);
-}
-
-static void
migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book)
{
EBookQuery *query = e_book_query_any_field_contains ("");
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 72f1a79e78..68112e49e1 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -180,15 +180,6 @@ view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
}
static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
- AddressbookView *view = (AddressbookView *) user_data;
- EABView *v = get_current_view (view);
- if (v)
- gtk_widget_show(eab_search_dialog_new(v));
-}
-
-static void
delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
{
AddressbookView *view = (AddressbookView *) user_data;
@@ -1055,7 +1046,7 @@ selector_tree_drag_motion (GtkWidget *widget,
GtkTreeViewDropPosition pos;
GtkTreeModel *model;
GtkTreeIter iter;
- GdkDragAction action;
+ GdkDragAction action = { 0, };
if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
x, y, &path, &pos))
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
index 79c578ef17..a039c49a6b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -397,20 +397,21 @@ fill_in_countries (GladeXML *gui)
static GList *country_list;
if (!sorted) {
int i;
- char *locale;
for (i = 0; countries[i]; i++) {
countries[i] = _(countries[i]);
}
- locale = setlocale (LC_COLLATE, NULL);
- qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
- country_list = NULL;
- for (i = 0; countries[i]; i++) {
- country_list = g_list_prepend (country_list, countries[i]);
- }
- country_list = g_list_reverse (country_list);
- sorted = TRUE;
+ if (setlocale (LC_COLLATE, NULL) != NULL) {
+ qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);
+ country_list = NULL;
+ for (i = 0; countries[i]; i++) {
+ country_list = g_list_prepend (country_list, countries[i]);
+ }
+ country_list = g_list_reverse (country_list);
+ sorted = TRUE;
+ } else
+ return;
}
gtk_combo_set_popdown_strings (combo, country_list);
}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 2ff60c9652..359eb37608 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -157,7 +157,7 @@ phones [] = {
};
/* Defaults from the table above */
-gint phones_default [] = { 1, 6, 9, 2, 7, 12, 10, 10 };
+static const gint phones_default [] = { 1, 6, 9, 2, 7, 12, 10, 10 };
static EContactField addresses [] = {
E_CONTACT_ADDRESS_WORK,
@@ -171,7 +171,7 @@ static EContactField address_labels [] = {
E_CONTACT_ADDRESS_LABEL_OTHER
};
-static gchar *address_name [] = {
+static const gchar *address_name [] = {
"work",
"home",
"other"
@@ -192,7 +192,7 @@ im_service [] =
};
/* Defaults from the table above */
-gint im_service_default [] = { 0, 2, 4, 5 };
+static const gint im_service_default [] = { 0, 2, 4, 5 };
static struct {
gchar *name;
@@ -206,7 +206,7 @@ common_location [] =
};
/* Default from the table above */
-gint email_default [] = { 0, 1, 2, 2 };
+static const gint email_default [] = { 0, 1, 2, 2 };
#define STRING_IS_EMPTY(x) (!(x) || !(*(x)))
#define STRING_MAKE_NON_NULL(x) ((x) ? (x) : "")
@@ -466,7 +466,6 @@ file_as_get_style (EContactEditor *editor)
EContactName *name = editor->name;
const gchar *company;
int i;
- int style;
if (!(file_as && GTK_IS_ENTRY(file_as)))
return -1;
@@ -999,7 +998,7 @@ extract_email (EContactEditor *editor)
l_next = g_list_next (l);
e_vcard_attribute_free (l->data);
- g_list_delete_link (l, l);
+ l = g_list_delete_link (l, l);
}
old_attr_list = l;
@@ -1232,7 +1231,7 @@ extract_phone (EContactEditor *editor)
l_next = g_list_next (l);
e_vcard_attribute_free (l->data);
- g_list_delete_link (l, l);
+ l = g_list_delete_link (l, l);
}
old_attr_list = l;
@@ -1299,11 +1298,11 @@ static void
sensitize_phone_types (EContactEditor *editor, GtkWidget *option_menu)
{
GtkWidget *menu;
- GList *item_list, *l;
+ GList *l;
gint i;
menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
- l = item_list = gtk_container_get_children (GTK_CONTAINER (menu));
+ l = gtk_container_get_children (GTK_CONTAINER (menu));
for (i = 0; i < G_N_ELEMENTS (phones); i++) {
GtkWidget *widget;
@@ -1591,7 +1590,7 @@ extract_im (EContactEditor *editor)
l_next = g_list_next (l);
e_vcard_attribute_free (l->data);
- g_list_delete_link (l, l);
+ l = g_list_delete_link (l, l);
}
old_service_attr_list = l;
@@ -1609,11 +1608,11 @@ static void
sensitize_im_types (EContactEditor *editor, GtkWidget *option_menu)
{
GtkWidget *menu;
- GList *item_list, *l;
+ GList *l;
gint i;
menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
- l = item_list = gtk_container_get_children (GTK_CONTAINER (menu));
+ l = gtk_container_get_children (GTK_CONTAINER (menu));
for (i = 0; i < G_N_ELEMENTS (im_service); i++) {
GtkWidget *widget;
@@ -2337,8 +2336,6 @@ init_simple (EContactEditor *editor)
gint i;
for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
- GtkWidget *widget;
-
widget = glade_xml_get_widget (editor->gui, simple_field_map [i].widget_name);
if (!widget)
continue;
@@ -2972,7 +2969,7 @@ e_contact_editor_close (EABEditor *editor)
}
}
-EContactField non_string_fields [] = {
+static const EContactField non_string_fields [] = {
E_CONTACT_FULL_NAME,
E_CONTACT_ADDRESS,
E_CONTACT_ADDRESS_HOME,
@@ -3647,6 +3644,7 @@ e_contact_editor_show (EABEditor *editor)
gtk_widget_show (ce->app);
}
+/* Is this declaration here so that libglade can reach this? */
GtkWidget *
e_contact_editor_create_date(gchar *name,
gchar *string1, gchar *string2,
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 87a3946314..eeb9454908 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1071,13 +1071,11 @@ fill_in_info(EContactListEditor *editor)
EContactPhoto *photo;
const char *file_as;
gboolean show_addresses = FALSE;
- gboolean is_evolution_list = FALSE;
GList *email_list;
GList *iter;
file_as = e_contact_get_const (editor->contact, E_CONTACT_FILE_AS);
email_list = e_contact_get_attributes (editor->contact, E_CONTACT_EMAIL);
- is_evolution_list = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_IS_LIST));
show_addresses = GPOINTER_TO_INT (e_contact_get (editor->contact, E_CONTACT_LIST_SHOW_ADDRESSES));
gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 60a95c59f3..7d8bf8f99b 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -84,30 +84,6 @@ static gchar *name_synonyms[][2] = {
};
static gboolean
-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)
-{
- gint len;
-
- if (!(a && b && *a && *b))
- return FALSE;
-
- /* If we are in 'strict' mode, b must match the beginning of a.
- So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.
-
- If strict is FALSE, it is sufficient for the strings to share
- some leading characters. In this case, "Robert" and "Robbie"
- would match, as would "Dave" and "Dan". */
-
- if (strict) {
- len = g_utf8_strlen (b, -1);
- } else {
- len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));
- }
-
- return !e_utf8_casefold_collate_len (a, b, len);
-}
-
-static gboolean
name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)
{
gint i;
@@ -321,7 +297,7 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
{
EContactName *a, *b;
gint matches=0, possible=0;
- gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;
+ gboolean family_match = FALSE;
g_return_val_if_fail (E_IS_CONTACT (contact1), EAB_CONTACT_MATCH_NOT_APPLICABLE);
g_return_val_if_fail (E_IS_CONTACT (contact2), EAB_CONTACT_MATCH_NOT_APPLICABLE);
@@ -339,7 +315,6 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
++possible;
if (name_fragment_match_with_synonyms (a->given, b->given, FALSE /* both inputs are complete */)) {
++matches;
- given_match = TRUE;
}
}
@@ -347,7 +322,6 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
++possible;
if (name_fragment_match_with_synonyms (a->additional, b->additional, FALSE /* both inputs are complete */)) {
++matches;
- additional_match = TRUE;
}
}
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index 3aef919722..6beb67c147 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -187,9 +187,5 @@ eab_search_dialog_new (EABView *addr_view)
static void
eab_search_dialog_dispose (GObject *object)
{
- EABSearchDialog *view;
-
- view = EAB_SEARCH_DIALOG (object);
-
G_OBJECT_CLASS(eab_search_dialog_parent_class)->dispose (object);
}
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, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">%s</td></tr>", html_label, _("(map)"), html);
#else
g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font></td><td valign=\"top\">%s</td></tr>", 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;
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
index 8c41f9491b..f5ac90bae0 100644
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ b/addressbook/printing/e-contact-print-style-editor.c
@@ -66,10 +66,8 @@ static void
e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
{
GtkObjectClass *object_class;
- GtkVBoxClass *vbox_class;
object_class = (GtkObjectClass*) klass;
- vbox_class = (GtkVBoxClass *) klass;
parent_class = gtk_type_class (gtk_vbox_get_type ());
@@ -137,10 +135,6 @@ e_contact_print_style_editor_new (char *filename)
static void
e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
{
- EContactPrintStyleEditor *e_contact_print_style_editor;
-
- e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-
switch (arg_id){
default:
break;
@@ -150,10 +144,6 @@ e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
static void
e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
- EContactPrintStyleEditor *e_contact_print_style_editor;
-
- e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
switch (arg_id) {
default:
arg->type = GTK_TYPE_INVALID;
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index afe5124724..a463d43480 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -345,7 +345,7 @@ eab_book_and_contact_list_to_string (EBook *book, GList *contacts)
return s1;
}
-#if notyet
+#ifdef notyet
/*
* Convenience routine to check for addresses in the local address book.
*/