diff options
Diffstat (limited to 'libempathy-gtk/empathy-individual-view.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 9d23027fc..51c9dfc29 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -55,7 +55,6 @@ #include "empathy-cell-renderer-activatable.h" #include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" -#include "empathy-gtk-marshal.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> @@ -132,8 +131,8 @@ typedef enum { (gchar *) T, 0, I } static const GtkTargetEntry drag_types_dest[] = { - DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID), - DRAG_TYPE ("text/persona-id", DND_DRAG_TYPE_PERSONA_ID), + DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID), + DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID), DRAG_TYPE ("text/path-list", DND_DRAG_TYPE_URI_LIST), DRAG_TYPE ("text/uri-list", DND_DRAG_TYPE_URI_LIST), DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING), @@ -141,7 +140,7 @@ static const GtkTargetEntry drag_types_dest[] = { }; static const GtkTargetEntry drag_types_source[] = { - DRAG_TYPE ("text/individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID), + DRAG_TYPE ("text/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID), }; #undef DRAG_TYPE @@ -866,7 +865,7 @@ individual_view_drag_data_get (GtkWidget *widget, if (info == DND_DRAG_TYPE_INDIVIDUAL_ID) { gtk_selection_data_set (selection, - gdk_atom_intern ("text/individual-id", FALSE), 8, + gdk_atom_intern ("text/x-individual-id", FALSE), 8, (guchar *) individual_id, strlen (individual_id) + 1); } @@ -2152,7 +2151,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_individual_received), NULL, NULL, - _empathy_gtk_marshal_VOID__UINT_OBJECT_STRING_STRING, + g_cclosure_marshal_generic, G_TYPE_NONE, 4, G_TYPE_UINT, FOLKS_TYPE_INDIVIDUAL, G_TYPE_STRING, G_TYPE_STRING); @@ -2162,7 +2161,7 @@ empathy_individual_view_class_init (EmpathyIndividualViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EmpathyIndividualViewClass, drag_persona_received), NULL, NULL, - _empathy_gtk_marshal_BOOLEAN__UINT_OBJECT_OBJECT, + g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 3, G_TYPE_UINT, FOLKS_TYPE_PERSONA, FOLKS_TYPE_INDIVIDUAL); g_object_class_install_property (object_class, |