diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-31 04:23:12 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | 4895118afc287dc511792a5f91f109a2e1f868d0 (patch) | |
| tree | 21a92696c37001614f506534bf3c85b826e79701 /libcaja-private/caja-clipboard.c | |
| parent | ca47debc4ffe4f3ec5b8d6094261dbef02b73dcd (diff) | |
| download | caja-4895118afc287dc511792a5f91f109a2e1f868d0.tar.bz2 caja-4895118afc287dc511792a5f91f109a2e1f868d0.tar.xz | |
[lc-p] 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 working with GTK2
Original commit:
http://git.gnome.org/browse/nautilus/commit/?id=aef4cfcf93ef34a0b2d4c87b40fcec2b7a66dd06
Diffstat (limited to 'libcaja-private/caja-clipboard.c')
| -rw-r--r-- | libcaja-private/caja-clipboard.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c index b1614509..bc06675a 100644 --- a/libcaja-private/caja-clipboard.c +++ b/libcaja-private/caja-clipboard.c @@ -432,7 +432,7 @@ owner_change_callback (GtkClipboard *clipboard, } static void -target_destroy_callback (GtkObject *object, +target_destroy_callback (GtkWidget *object, gpointer callback_data) { TargetCallbackData *target_data; @@ -440,7 +440,7 @@ target_destroy_callback (GtkObject *object, g_assert (callback_data != NULL); target_data = callback_data; - if (clipboard_items_are_merged_in (GTK_WIDGET(object))) + if (clipboard_items_are_merged_in (object)) { merge_out_clipboard_menu_items (G_OBJECT (object), callback_data); } |