aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-09-12 22:10:13 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-09-13 15:50:56 +0800
commit36211fc1a6e977c82e1f6467691a499fe6b68410 (patch)
tree5b04deecd28704dd75d1ad24f2679950750c2f7f
parent656e9addef5ab7c5d3dc21fc0c502a15fc94331e (diff)
downloadgsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar.gz
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar.bz2
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar.lz
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar.xz
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.tar.zst
gsoc2013-empathy-36211fc1a6e977c82e1f6467691a499fe6b68410.zip
rename text/{persona,individual}-id as they are not standard
https://bugzilla.gnome.org/show_bug.cgi?id=648315
-rw-r--r--libempathy-gtk/empathy-individual-linker.c2
-rw-r--r--libempathy-gtk/empathy-individual-view.c8
-rw-r--r--libempathy-gtk/empathy-persona-view.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 54663ef26..793c2827f 100644
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -280,7 +280,7 @@ individual_view_drag_motion_cb (GtkWidget *widget,
target = gtk_drag_dest_find_target (GTK_WIDGET (view), context, NULL);
- if (target == gdk_atom_intern_static_string ("text/persona-id"))
+ if (target == gdk_atom_intern_static_string ("text/x-persona-id"))
{
GtkTreePath *path;
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 9d23027fc..03fe897ea 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -132,8 +132,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 +141,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 +866,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);
}
diff --git a/libempathy-gtk/empathy-persona-view.c b/libempathy-gtk/empathy-persona-view.c
index 5cb77c94b..d5a8c69ab 100644
--- a/libempathy-gtk/empathy-persona-view.c
+++ b/libempathy-gtk/empathy-persona-view.c
@@ -96,13 +96,13 @@ 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/x-individual-id", DND_DRAG_TYPE_INDIVIDUAL_ID),
DRAG_TYPE ("text/plain", DND_DRAG_TYPE_STRING),
DRAG_TYPE ("STRING", DND_DRAG_TYPE_STRING),
};
static const GtkTargetEntry drag_types_source[] = {
- DRAG_TYPE ("text/persona-id", DND_DRAG_TYPE_PERSONA_ID),
+ DRAG_TYPE ("text/x-persona-id", DND_DRAG_TYPE_PERSONA_ID),
};
#undef DRAG_TYPE
@@ -477,7 +477,7 @@ drag_data_get (GtkWidget *widget,
persona_uid = folks_persona_get_uid (persona);
gtk_selection_data_set (selection,
- gdk_atom_intern ("text/persona-id", FALSE), 8,
+ gdk_atom_intern ("text/x-persona-id", FALSE), 8,
(guchar *) persona_uid, strlen (persona_uid) + 1);
g_object_unref (persona);