diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 21 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 29 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-simple-card-bonobo.h | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-address.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-fullname.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 1 |
6 files changed, 47 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 9156c0165f..6efd4cfd19 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,24 @@ +2003-02-27 Chris Toshok <toshok@ximian.com> + + * gui/component/addressbook.c (book_open_cb): use g_signal_connect + here, not swapped... although since we pass the widget as the + closure it really doesn't matter. + (load_uri_auth_cb): use a GtkDialog here. + (search_result): same. + + * gui/component/select-names/e-simple-card-bonobo.h: add prototype + for e_simple_card_bonobo_construct to fix warning. + + * gui/widgets/e-addressbook-view.c (create_alphabet): remove call + to gtk_widget_set_usize. + + * gui/contact-editor/e-contact-editor-address.c + (e_contact_editor_address_init): gtk_window_set_policy => + gtk_window_set_resizable. + + * gui/contact-editor/e-contact-editor-fullname.c + (e_contact_editor_fullname_init): same. + 2003-02-27 JP Rosevear <jpr@ximian.com> * conduit/Makefile.am: link to libversit libtool object diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 7e43be131c..b5f7bc5df8 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -549,10 +549,10 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure) label_string, NULL); - g_signal_connect_swapped (warning_dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - warning_dialog); + g_signal_connect (warning_dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + warning_dialog); gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Unable to open addressbook")); @@ -614,7 +614,14 @@ load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure) if (status != E_BOOK_STATUS_SUCCESS) { if (status == E_BOOK_STATUS_CANCELLED) { /* the user clicked cancel in the password dialog */ - gnome_warning_dialog (_("Accessing LDAP Server anonymously")); + GtkWidget *dialog; + dialog = gtk_message_dialog_new (NULL, + 0, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + _("Accessing LDAP Server anonymously")); + g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); + gtk_widget_show (dialog); data->cb (book, E_BOOK_STATUS_SUCCESS, data->closure); g_free (data->clean_uri); g_free (data); @@ -1000,8 +1007,16 @@ search_result (EAddressbookView *eav, EBookViewStatus status, AddressbookView *v break; } - if (str) - gnome_warning_dialog (str); + if (str) { + GtkWidget *dialog; + dialog = gtk_message_dialog_new (NULL, + 0, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + str); + g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); + gtk_widget_show (dialog); + } } static void diff --git a/addressbook/gui/component/select-names/e-simple-card-bonobo.h b/addressbook/gui/component/select-names/e-simple-card-bonobo.h index 93429f02f8..7bc2d65830 100644 --- a/addressbook/gui/component/select-names/e-simple-card-bonobo.h +++ b/addressbook/gui/component/select-names/e-simple-card-bonobo.h @@ -61,6 +61,8 @@ struct _ESimpleCardBonoboClass { GType e_simple_card_bonobo_get_type (void); ESimpleCardBonobo *e_simple_card_bonobo_new (ECardSimple *card_simple); +void e_simple_card_bonobo_construct (ESimpleCardBonobo *simple_card, + ECardSimple *card_simple); #ifdef __cplusplus } diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 202177935f..f6a75bbfe5 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -418,7 +418,7 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE); + gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_address), TRUE); e_contact_editor_address->address = NULL; diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 02cf3edd44..917a8fd075 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -110,7 +110,7 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE); + gtk_window_set_resizable(GTK_WINDOW(e_contact_editor_fullname), TRUE); e_contact_editor_fullname->name = NULL; gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL, NULL); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index db1636693a..6b6ddffe3f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1097,7 +1097,6 @@ create_alphabet (EAddressbookView *view) vbox = gtk_vbox_new (FALSE, 4); gtk_container_add (GTK_CONTAINER (viewport), vbox); - gtk_widget_set_usize (vbox, 27, 0); labels = _(button_labels); sep = g_utf8_get_char (labels); |