diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 12 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 5 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 6 |
4 files changed, 17 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 19690a432c..fb23ec883d 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,17 @@ 2002-11-08 Chris Toshok <toshok@ximian.com> + * gui/widgets/e-addressbook-reflow-adapter.c + (addressbook_get_property): oops, missed these casts. + + * gui/component/addressbook.c (get_master_list): remove the + PENDING_PORT_WORK ifdef, just ported ECategoriesMasterList. + (make_suboptions): same. + + * gui/contact-editor/e-contact-editor.c (categories_clicked): + same. + +2002-11-08 Chris Toshok <toshok@ximian.com> + * gui/widgets/test-reflow.c: port work. * gui/widgets/test-minicard-view.c: port work. diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index fb37952fe9..51314199e4 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -421,11 +421,9 @@ static ECategoriesMasterList * get_master_list (void) { static ECategoriesMasterList *category_list = NULL; -#ifdef PENDING_PORT_WORK if (category_list == NULL) category_list = e_categories_master_list_wombat_new (); -#endif return category_list; } @@ -1057,7 +1055,6 @@ compare_subitems (const void *a, const void *b) static void make_suboptions (AddressbookView *view) { -#if PENDING_PORT_WORK ESearchBarSubitem *subitems; ECategoriesMasterList *master_list; gint i, N; @@ -1083,7 +1080,6 @@ make_suboptions (AddressbookView *view) qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems); e_search_bar_set_suboption (view->search, ESB_CATEGORY, subitems); -#endif } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index f9d541df45..c78715008c 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -28,6 +28,7 @@ #include <gtk/gtkcheckmenuitem.h> #include <gtk/gtkcombo.h> #include <gtk/gtktextview.h> +#include <gtk/gtkmessagedialog.h> #include <libgnomeui/gnome-popup-menu.h> #include <libgnomeui/gnome-window-icon.h> #include <libgnome/gnome-i18n.h> @@ -849,7 +850,6 @@ full_addr_clicked(GtkWidget *button, EContactEditor *editor) static void categories_clicked(GtkWidget *button, EContactEditor *editor) { -#ifdef PENDING_PORT_WORK char *categories = NULL; GtkDialog *dialog; int result; @@ -866,7 +866,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) if (dialog == NULL) { GtkWidget *uh_oh = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, - GTK_RESPONSE_OK + GTK_RESPONSE_OK, _("Category editor not available."), NULL); gtk_widget_show (uh_oh); @@ -895,7 +895,6 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) g_free(categories); } gtk_widget_destroy(GTK_WIDGET(dialog)); -#endif } static void diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 01e1eb120b..5b1d4e74e7 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -310,18 +310,18 @@ addressbook_get_property (GObject *object, guint prop_id, GValue *value, GParamS switch (prop_id) { case PROP_BOOK: { - g_object_get_property (priv->model, + g_object_get_property (G_OBJECT (priv->model), "book", value); break; } case PROP_QUERY: { char *query; - g_object_get_property (priv->model, + g_object_get_property (G_OBJECT (priv->model), "query", value); break; } case PROP_EDITABLE: { - g_object_get_property (priv->model, + g_object_get_property (G_OBJECT (priv->model), "editable", value); break; } |