aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/component/e-address-widget.c
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-06 16:26:18 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-06 16:26:18 +0800
commit3f73fe7fd078c0c5a91b2714dbb1c7ab25267d42 (patch)
tree6a881563c902748b9e93f9b42e56881c34204791 /addressbook/gui/component/e-address-widget.c
parent5ae49242fcdbdb41bdfa642f43eb1805dc209534 (diff)
downloadgsoc2013-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-widget.c')
-rw-r--r--addressbook/gui/component/e-address-widget.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c
index d01999d34f..1a1786614f 100644
--- a/addressbook/gui/component/e-address-widget.c
+++ b/addressbook/gui/component/e-address-widget.c
@@ -26,6 +26,8 @@
#include <config.h>
#include <ctype.h>
+#include <gtk/gtklabel.h>
+#include <libgnomeui/gnome-popup-menu.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-property-bag.h>
#include <bonobo/bonobo-generic-factory.h>
@@ -441,7 +443,7 @@ e_address_widget_popup (EAddressWidget *addr, GdkEventButton *ev)
pop = addr->card ? popup_menu_card (addr) : popup_menu_nocard (addr);
if (pop)
- gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr);
+ gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr, GTK_WIDGET (addr));
}
/*
@@ -547,14 +549,16 @@ e_address_widget_factory_new_control (void)
BONOBO_ARG_INT, NULL, NULL,
BONOBO_PROPERTY_WRITEABLE);
- 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));
return control;
}
static BonoboObject *
-e_address_widget_factory (BonoboGenericFactory *factory, gpointer user_data)
+e_address_widget_factory (BonoboGenericFactory *factory,
+ const char *component_id,
+ gpointer user_data)
{
return BONOBO_OBJECT (e_address_widget_factory_new_control ());
}