Updating branch refs/heads/master
to 0f28d17dc94023f2fa1b18de80c385977ab483c6 (commit)
from 585dbe3bef567a7c56dd5c4570dec54a78700631 (commit)
commit 0f28d17dc94023f2fa1b18de80c385977ab483c6
Author: Nick Schermer <[email protected]>
Date: Tue May 11 20:51:12 2010 +0200
Fix compiler warning.
exo/exo-tree-view.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
index 024e0d5..f7baa56 100644
--- a/exo/exo-tree-view.c
+++ b/exo/exo-tree-view.c
@@ -266,6 +266,7 @@ exo_tree_view_button_press_event (GtkWidget *widget,
gboolean result;
GList *selected_paths = NULL;
GList *lp;
+ gpointer drag_data;
/* by default we won't emit "row-activated" on button-release-events */
tree_view->priv->button_release_activates = FALSE;
@@ -334,7 +335,7 @@ exo_tree_view_button_press_event (GtkWidget *widget,
if (G_LIKELY (path == NULL || !gtk_tree_selection_path_is_selected
(selection, path)))
{
/* need to disable drag and drop because we're rubberbanding now */
- gpointer drag_data = g_object_get_data (G_OBJECT (tree_view),
I_("gtk-site-data"));
+ drag_data = g_object_get_data (G_OBJECT (tree_view),
I_("gtk-site-data"));
if (G_LIKELY (drag_data != NULL))
{
g_signal_handlers_block_matched (G_OBJECT (tree_view),
@@ -400,6 +401,7 @@ exo_tree_view_button_release_event (GtkWidget *widget,
GtkTreeSelection *selection;
GtkTreePath *path;
ExoTreeView *tree_view = EXO_TREE_VIEW (widget);
+ gpointer drag_data;
/* verify that the release event is for the internal tree view window */
if (G_LIKELY (event->window == gtk_tree_view_get_bin_window (GTK_TREE_VIEW
(tree_view))))
@@ -447,7 +449,7 @@ exo_tree_view_button_release_event (GtkWidget *widget,
/* check if we need to re-enable drag and drop */
if (G_LIKELY (tree_view->priv->button_release_unblocks_dnd))
{
- gpointer drag_data = g_object_get_data (G_OBJECT (tree_view),
I_("gtk-site-data"));
+ drag_data = g_object_get_data (G_OBJECT (tree_view),
I_("gtk-site-data"));
if (G_LIKELY (drag_data != NULL))
{
g_signal_handlers_unblock_matched (G_OBJECT (tree_view),
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits