diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-03-01 07:35:51 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-03-01 07:35:51 +0800 |
| commit | 58be26a2498b99b7018dd9880e75addbc62a74f3 (patch) | |
| tree | fde55d3e647526e66191e54917ca7aa38883d0f1 /calendar/importers/icalendar-importer.c | |
| parent | e923674e247e076b0e90ac493c68db59c8edf211 (diff) | |
| download | gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar.gz gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar.bz2 gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar.lz gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar.xz gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.tar.zst gsoc2013-evolution-58be26a2498b99b7018dd9880e75addbc62a74f3.zip | |
Shlibify.
2003-02-28 Hans Petter Jansson <hpj@ximian.com>
* importers/Makefile.am: Shlibify.
* importers/GNOME_Evolution_Calendar_Importer.server.in.in:
Shlibify.
* importers/icalendar-importer.c: Add necessary includes.
(importer_destroy_cb): This is now a GWeakNotify func. gtk_ -> g_.
(ical_importer_new)
(vcal_importer_new)
(gnome_calendar_importer_destroy_cb): Destroy signal -> weak ref.
* importers/main.c: Add necessary includes. Shlibify.
svn path=/trunk/; revision=20115
Diffstat (limited to 'calendar/importers/icalendar-importer.c')
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index b8168ff39e..6de5624805 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include <string.h> +#include <unistd.h> #include <sys/types.h> #include <fcntl.h> #include <gtk/gtksignal.h> @@ -63,14 +65,14 @@ typedef struct { */ static void -importer_destroy_cb (GtkObject *object, gpointer user_data) +importer_destroy_cb (gpointer user_data) { ICalImporter *ici = (ICalImporter *) user_data; g_return_if_fail (ici != NULL); - gtk_object_unref (GTK_OBJECT (ici->client)); - gtk_object_unref (GTK_OBJECT (ici->tasks_client)); + g_object_unref (ici->client); + g_object_unref (ici->tasks_client); if (ici->icalcomp != NULL) { icalcomponent_free (ici->icalcomp); @@ -424,8 +426,8 @@ ical_importer_new (void) NULL, ici); connect_to_shell (ici); - gtk_signal_connect (GTK_OBJECT (ici->importer), "destroy", - GTK_SIGNAL_FUNC (importer_destroy_cb), ici); + + g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici); return BONOBO_OBJECT (ici->importer); } @@ -548,8 +550,8 @@ vcal_importer_new (void) NULL, ici); connect_to_shell (ici); - gtk_signal_connect (GTK_OBJECT (ici->importer), "destroy", - GTK_SIGNAL_FUNC (importer_destroy_cb), ici); + + g_object_weak_ref (G_OBJECT (ici->importer), (GWeakNotify) importer_destroy_cb, ici); return BONOBO_OBJECT (ici->importer); } @@ -560,7 +562,7 @@ vcal_importer_new (void) static void -gnome_calendar_importer_destroy_cb (GtkObject *object, gpointer user_data) +gnome_calendar_importer_destroy_cb (gpointer user_data) { ICalIntelligentImporter *ici = (ICalIntelligentImporter *) user_data; @@ -733,8 +735,7 @@ gnome_calendar_importer_new (void) ici); - gtk_signal_connect (GTK_OBJECT (importer), "destroy", - GTK_SIGNAL_FUNC (gnome_calendar_importer_destroy_cb), ici); + g_object_weak_ref (G_OBJECT (importer), (GWeakNotify) gnome_calendar_importer_destroy_cb, ici); control = create_checkboxes_control (ici); bonobo_object_add_interface (BONOBO_OBJECT (importer), |