diff options
author | Jasmine Hassan <[email protected]> | 2012-10-31 04:42:15 +0200 |
---|---|---|
committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
commit | 2472d52a0f28dd84d362dcc5570e747a82aa8ba6 (patch) | |
tree | 3761aac83f319d8e4fb76286b0a5e1f3e2430fe9 /src/caja-location-dialog.c | |
parent | ae33b1c624c008ca0818ab08735968c8d01fae1c (diff) | |
download | caja-2472d52a0f28dd84d362dcc5570e747a82aa8ba6.tar.bz2 caja-2472d52a0f28dd84d362dcc5570e747a82aa8ba6.tar.xz |
[src] don't use GtkObject (GTK3)
the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
(after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
So we use conditionals in this case, to keep it working with GTK2.
A tad similar:
http://git.gnome.org/browse/nautilus/commit/?id=cc6cb51e827c0b15d4ef09f12d37b9f331ddcef8
Diffstat (limited to 'src/caja-location-dialog.c')
-rw-r--r-- | src/caja-location-dialog.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c index 99596b87..ec102300 100644 --- a/src/caja-location-dialog.c +++ b/src/caja-location-dialog.c @@ -62,16 +62,6 @@ caja_location_dialog_finalize (GObject *object) } static void -caja_location_dialog_destroy (GtkObject *object) -{ - CajaLocationDialog *dialog; - - dialog = CAJA_LOCATION_DIALOG (object); - - EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); -} - -static void open_current_location (CajaLocationDialog *dialog) { GFile *location; @@ -136,14 +126,7 @@ entry_activate_callback (GtkEntry *entry, static void caja_location_dialog_class_init (CajaLocationDialogClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - - gobject_class = G_OBJECT_CLASS (class); - gobject_class->finalize = caja_location_dialog_finalize; - - object_class = GTK_OBJECT_CLASS (class); - object_class->destroy = caja_location_dialog_destroy; + G_OBJECT_CLASS (class)->finalize = caja_location_dialog_finalize; } static void |