Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stupid typo in last commit.

Browse Source 
Thu Jan 27 15:22:09 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
This commit is contained in:
Owen Taylor
2000-01-27 02:39:44 +00:00
committed by Owen Taylor
parent 958d74e856
commit ef642b7799
8 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-0
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-10
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-2
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-4
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-6
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

4
ChangeLog.pre-2-8
View File

@@ -1,3 +1,7 @@
Thu Jan 27 15:22:09 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_begin): Fix stupid typo in last commit.
Thu Jan 27 18:00:55 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: prefix all autogenerated source that get build in

18
gtk/gtkdnd.c
View File

@@ -546,6 +546,17 @@ gtk_drag_get_event_actions (GdkEvent *event,
*suggested_action = GDK_ACTION_LINK;
}
}
else
{
*possible_actions = actions;
if (actions & GDK_ACTION_COPY)
*suggested_action = GDK_ACTION_COPY;
else if (actions & GDK_ACTION_MOVE)
*suggested_action = GDK_ACTION_MOVE;
else if (actions & GDK_ACTION_LINK)
*suggested_action = GDK_ACTION_LINK;
}
return;
}
@@ -1673,13 +1684,12 @@ gtk_drag_begin (GtkWidget *widget,
gtk_drag_get_event_actions (event, info->button, actions,
&suggested_action, &possible_actions);
if (event)
info->cursor = gtk_drag_get_cursor (suggested_action);
info->cursor = gtk_drag_get_cursor (suggested_action);
/* Set cur_x, cur_y here so if the "drag_begin" signal shows
* the drag icon, it will be in the right place
*/
if (event->type == GDK_MOTION_NOTIFY)
if (event && event->type == GDK_MOTION_NOTIFY)
{
info->cur_x = event->motion.x_root;
info->cur_y = event->motion.y_root;
@@ -1696,7 +1706,7 @@ gtk_drag_begin (GtkWidget *widget,
gtk_signal_emit_by_name (GTK_OBJECT (widget), "drag_begin",
info->context);
if (event->type == GDK_MOTION_NOTIFY)
if (event && event->type == GDK_MOTION_NOTIFY)
gtk_drag_motion_cb (info->ipc_widget, (GdkEventMotion *)event, info);
info->start_x = info->cur_x;