diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-11-06 16:26:18 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-06 16:26:18 +0800 |
| commit | 3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42 (patch) | |
| tree | 6a881563c902748b9e93f9b42e56881c34204791 /addressbook/gui/component/e-address-popup.c | |
| parent | 5ae49242fcdbdb41bdfa642f43eb1805dc209534 (diff) | |
| download | gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar.gz gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar.bz2 gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar.lz gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar.xz gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.tar.zst gsoc2013-evolution-3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42.zip | |
ignore the new .server file.
2002-11-05 Chris Toshok <toshok@ximian.com>
* gui/component/.cvsignore: ignore the new .server file.
* gui/component/Makefile.am: typical port stuff. switch the .oaf
to .server, and leave out a lot of libs so we can actually get
things linking.
* gui/component/GNOME_Evolution_Addressbook.server.in: rename
.oaf.in here.
* gui/component/addressbook-component.c: Port to GObject/gnome2.
* gui/component/addressbook-config.c: Port to GObject/gnome2.
* gui/component/addressbook-factory.c: Port to GObject/gnome2.
* gui/component/addressbook-storage.c: Port to GObject/gnome2.
* gui/component/addressbook.[ch]: Port to GObject/gnome2.
* gui/component/e-address-popup.[ch]: Port to GObject/gnome2.
* gui/component/e-address-widget.[ch]: Port to GObject/gnome2.
* gui/component/e-cardlist-model.h: Port to GObject/gnome2.
svn path=/trunk/; revision=18591
Diffstat (limited to 'addressbook/gui/component/e-address-popup.c')
| -rw-r--r-- | addressbook/gui/component/e-address-popup.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index 553ba642c8..a545d2762c 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -29,6 +29,7 @@ */ #include <config.h> +#include <string.h> #include "addressbook.h" #include "e-address-popup.h" #include <bonobo/bonobo-control.h> @@ -130,8 +131,8 @@ mini_wizard_new (void) wiz->body = gtk_vbox_new (FALSE, 2); wiz->vbox = gtk_vbox_new (FALSE, 2); - wiz->ok_button = gnome_stock_button (GNOME_STOCK_BUTTON_OK); - wiz->cancel_button = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL); + wiz->ok_button = gtk_button_new_from_stock (GTK_STOCK_OK); + wiz->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); wiz->ok_cb = NULL; wiz->cleanup_cb = NULL; @@ -236,10 +237,10 @@ email_menu_add_option (EMailMenu *menu, const gchar *addr) gtk_widget_show_all (menu_item); gtk_menu_append (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu->option_menu))), menu_item); - gtk_signal_connect (GTK_OBJECT (menu_item), - "activate", - menu_activate_cb, - menu); + g_signal_connect (menu_item, + "activate", + G_CALLBACK (menu_activate_cb), + menu); } static void @@ -1247,7 +1248,7 @@ e_address_popup_factory_new_control (void) BONOBO_ARG_BOOLEAN, NULL, NULL, BONOBO_PROPERTY_READABLE); - bonobo_control_set_properties (control, bag); + bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (bag)), NULL); bonobo_object_unref (BONOBO_OBJECT (bag)); addy->es = bonobo_event_source_new (); @@ -1258,7 +1259,9 @@ e_address_popup_factory_new_control (void) } static BonoboObject * -e_address_popup_factory (BonoboGenericFactory *factory, gpointer user_data) +e_address_popup_factory (BonoboGenericFactory *factory, + const char *component_id, + gpointer user_data) { return BONOBO_OBJECT (e_address_popup_factory_new_control ()); } |