From d1f4899fc77c8fa20486d61d33f6be96fa557682 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 17 Dec 2003 22:18:43 +0000 Subject: [PATCH] fix compile warning. (#122727, patch from Kjartan Maraas). Wed Dec 17 23:16:45 2003 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. (#122727, patch from Kjartan Maraas). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 2 +- 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bbb3b7b3a..57fbcb5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 17 23:16:45 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. + (#122727, patch from Kjartan Maraas). + Wed Dec 17 21:23:01 2003 Kristian Rietveld Yay! Fixed height mode! Hooray! (Part 2 of #80868). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbb3b7b3a..57fbcb5ce 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 17 23:16:45 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. + (#122727, patch from Kjartan Maraas). + Wed Dec 17 21:23:01 2003 Kristian Rietveld Yay! Fixed height mode! Hooray! (Part 2 of #80868). diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbb3b7b3a..57fbcb5ce 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 17 23:16:45 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. + (#122727, patch from Kjartan Maraas). + Wed Dec 17 21:23:01 2003 Kristian Rietveld Yay! Fixed height mode! Hooray! (Part 2 of #80868). diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbb3b7b3a..57fbcb5ce 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 17 23:16:45 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. + (#122727, patch from Kjartan Maraas). + Wed Dec 17 21:23:01 2003 Kristian Rietveld Yay! Fixed height mode! Hooray! (Part 2 of #80868). diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbb3b7b3a..57fbcb5ce 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 17 23:16:45 2003 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_button_press): fix compile warning. + (#122727, patch from Kjartan Maraas). + Wed Dec 17 21:23:01 2003 Kristian Rietveld Yay! Fixed height mode! Hooray! (Part 2 of #80868). diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 1cbb3e9e8..ee5ee4128 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2214,7 +2214,7 @@ gtk_tree_view_button_press (GtkWidget *widget, /* Save press to possibly begin a drag */ grab_widget = gtk_grab_get_current (); - if ((grab_widget == NULL || grab_widget == GTK_WIDGET (tree_view)) && + if ((grab_widget == NULL || grab_widget == widget) && !column_handled_click && tree_view->priv->pressed_button < 0) {