aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/component/addressbook.c6
-rw-r--r--addressbook/gui/component/select-names/e-select-names-completion.c7
3 files changed, 11 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 9ff5690c2a..e0dd622192 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2001-08-03 Christopher James Lahey <clahey@ximian.com>
+ * gui/component/addressbook.c (addressbook_factory_new_control):
+ Fixed warnings here.
+
+ * gui/component/select-names/e-select-names-completion.c
+ (hash_cleanup_fn): Removed this unused function.
+
+2001-08-03 Christopher James Lahey <clahey@ximian.com>
+
* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
fill_in_info): Made the list of E_CARD_PHONE types in
phone_correspondences more complete by adding the new 5
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 6f671b29a2..f87d49d689 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -706,7 +706,7 @@ BonoboControl *
addressbook_factory_new_control (void)
{
AddressbookView *view;
- GtkFrame *frame;
+ GtkWidget *frame;
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
@@ -732,8 +732,8 @@ addressbook_factory_new_control (void)
GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
- gtk_container_add (GTK_CONTAINER (frame), view->view);
- gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET(frame),
+ gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view->view));
+ gtk_box_pack_start (GTK_BOX (view->vbox), frame,
TRUE, TRUE, 0);
/* create the initial view */
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
index 8bee374f90..8222ae86ad 100644
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ b/addressbook/gui/component/select-names/e-select-names-completion.c
@@ -543,13 +543,6 @@ book_query_score (ESelectNamesCompletion *comp, EDestination *dest)
}
static void
-hash_cleanup_fn (gpointer key, gpointer val, gpointer closure)
-{
- g_free (key);
- g_free (val);
-}
-
-static void
book_query_process_card_list (ESelectNamesCompletion *comp, const GList *cards)
{
while (cards) {