[dia] [gtk-deprecated] Use gtk_selection_data_*() accessors
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [gtk-deprecated] Use gtk_selection_data_*() accessors
- Date: Sun, 19 Aug 2012 17:37:46 +0000 (UTC)
commit ef9450ba5c293782387e59a045766138f2b9214f
Author: Hans Breuer <hans breuer org>
Date: Tue Jul 31 16:03:57 2012 +0200
[gtk-deprecated] Use gtk_selection_data_*() accessors
app/interface.c | 8 ++++----
app/toolbox.c | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/app/interface.c b/app/interface.c
index 119de77..d740c8f 100644
--- a/app/interface.c
+++ b/app/interface.c
@@ -77,7 +77,7 @@ dia_dnd_file_drag_data_received (GtkWidget *widget,
Diagram *diagram = NULL;
gchar *sPath = NULL, *pFrom, *pTo;
- pFrom = strstr((gchar *) data->data, "file:");
+ pFrom = strstr((gchar *) gtk_selection_data_get_data(data), "file:");
while (pFrom) {
GError *error = NULL;
@@ -313,10 +313,10 @@ display_data_received_callback (GtkWidget *widget,
guint time,
DDisplay *ddisp)
{
- if (data->format == 8 && data->length == sizeof(ToolButtonData *) &&
+ if (gtk_selection_data_get_format(data) == 8 &&
+ gtk_selection_data_get_length(data) == sizeof(ToolButtonData *) &&
gtk_drag_get_source_widget(context) != NULL) {
- ToolButtonData *tooldata = *(ToolButtonData **)data->data;
-
+ ToolButtonData *tooldata = *(ToolButtonData **)gtk_selection_data_get_data(data);
/* g_message("Tool drop %s at (%d, %d)", (gchar *)tooldata->extra_data, x, y);*/
ddisplay_drop_object(ddisp, x, y,
object_get_type((gchar *)tooldata->extra_data),
diff --git a/app/toolbox.c b/app/toolbox.c
index 5d96cf9..69ed0db 100644
--- a/app/toolbox.c
+++ b/app/toolbox.c
@@ -223,7 +223,8 @@ tool_drag_data_get (GtkWidget *widget, GdkDragContext *context,
guint32 time, ToolButtonData *tooldata)
{
if (info == 0) {
- gtk_selection_data_set(selection_data, selection_data->target,
+ gtk_selection_data_set(selection_data,
+ gtk_selection_data_get_target(selection_data),
8, (guchar *)&tooldata, sizeof(ToolButtonData *));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]