diff options
| -rw-r--r-- | addressbook/ChangeLog | 10 | ||||
| -rw-r--r-- | addressbook/backend/ebook/e-card.c | 8 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-categories.h | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-categories.h | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 4 |
5 files changed, 16 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5c5e212db0..07d6aecbdd 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,13 @@ +2000-12-08 Christopher James Lahey <clahey@helixcode.com> + + * backend/ebook/e-card.c: Fixed some formatting. + + * contact-editor/e-contact-editor-categories.h: Removed an + unneeded #include. + + * gui/widgets/e-addressbook-view.c: Connect to the signals on the + ETable instead of the ETableScrolled. + 2000-12-07 JP Rosevear <jpr@helixcode.com> * conduit/address-conduit.c (local_record_from_uid): Pass "" rather diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 643644ee31..ddbfb5453a 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -1577,15 +1577,15 @@ e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_PHONE: if (!card->phone) card->phone = e_list_new((EListCopyFunc) e_card_phone_copy, - (EListFreeFunc) e_card_phone_free, - NULL); + (EListFreeFunc) e_card_phone_free, + NULL); GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone); break; case ARG_EMAIL: if (!card->email) card->email = e_list_new((EListCopyFunc) g_strdup, - (EListFreeFunc) g_free, - NULL); + (EListFreeFunc) g_free, + NULL); GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email); break; case ARG_CATEGORIES: diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h index 3edff76b4b..04b3c686ed 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.h +++ b/addressbook/contact-editor/e-contact-editor-categories.h @@ -23,7 +23,6 @@ #include <gnome.h> #include <glade/glade.h> -#include <ebook/e-card.h> #include <gal/e-table/e-table-model.h> #ifdef __cplusplus @@ -37,7 +36,6 @@ extern "C" { * * name type read/write description * -------------------------------------------------------------------------------- - * name ECardName * RW The card currently being edited. Returns a copy. */ #define E_CONTACT_EDITOR_CATEGORIES_TYPE (e_contact_editor_categories_get_type ()) diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.h b/addressbook/gui/contact-editor/e-contact-editor-categories.h index 3edff76b4b..04b3c686ed 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-categories.h +++ b/addressbook/gui/contact-editor/e-contact-editor-categories.h @@ -23,7 +23,6 @@ #include <gnome.h> #include <glade/glade.h> -#include <ebook/e-card.h> #include <gal/e-table/e-table-model.h> #ifdef __cplusplus @@ -37,7 +36,6 @@ extern "C" { * * name type read/write description * -------------------------------------------------------------------------------- - * name ECardName * RW The card currently being edited. Returns a copy. */ #define E_CONTACT_EDITOR_CATEGORIES_TYPE (e_contact_editor_categories_get_type ()) diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 7f73ab42db..d5beb6e30b 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -554,9 +554,9 @@ create_table_view (EAddressbookView *view) view->object = GTK_OBJECT(model); view->widget = table; - gtk_signal_connect(GTK_OBJECT(table), "double_click", + gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "double_click", GTK_SIGNAL_FUNC(table_double_click), view); - gtk_signal_connect(GTK_OBJECT(table), "right_click", + gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "right_click", GTK_SIGNAL_FUNC(table_right_click), view); gtk_table_attach(GTK_TABLE(view), table, |