[maemo-commits] [maemo-commits] r17096 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-01-12 13:46:33 +0200 (Mon, 12 Jan 2009)
New Revision: 17096

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-01-12  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_motion_bin_window),
	(gtk_tree_view_maybe_begin_dragging_row), (gtk_tree_view_set_model):
	clean up the code a little with regard to queued action bookkeeping.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-12 11:40:22 UTC (rev 17095)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-12 11:46:33 UTC (rev 17096)
@@ -1,5 +1,11 @@
 2009-01-12  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_motion_bin_window),
+	(gtk_tree_view_maybe_begin_dragging_row), (gtk_tree_view_set_model):
+	clean up the code a little with regard to queued action bookkeeping.
+
+2009-01-12  Kristian Rietveld  <kris at imendio.com>
+
 	Fixes: NB#91657 - HildonPickerDialog closes immediatly when used
 	with some dynamic tree model
 

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-12 11:40:22 UTC (rev 17095)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-01-12 11:46:33 UTC (rev 17096)
@@ -494,6 +494,7 @@
 						  GdkEvent  *event);
 static void     free_queued_select_row           (GtkTreeView  *tree_view);
 static void     free_queued_activate_row         (GtkTreeView  *tree_view);
+static void     free_queued_actions              (GtkTreeView  *tree_view);
 #endif /* MAEMO_CHANGES */
 
 static guint tree_view_signals [LAST_SIGNAL] = { 0 };
@@ -4662,14 +4663,6 @@
   if (tree_view->priv->rubber_band_status == RUBBER_BAND_MAYBE_START)
     {
 #ifdef MAEMO_CHANGES
-      gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
-      tree_view->priv->queued_expand_row = NULL;
-
-      gtk_tree_row_reference_free (tree_view->priv->queued_tapped_row);
-      tree_view->priv->queued_tapped_row = NULL;
-
-      free_queued_activate_row (tree_view);
-
       if (mode == HILDON_DIABLO
           && gtk_tree_row_reference_valid (tree_view->priv->queued_select_row))
 	{
@@ -4682,7 +4675,7 @@
 	  gtk_tree_path_free (path);
 	}
 
-      free_queued_select_row (tree_view);
+      free_queued_actions (tree_view);
 #endif /* MAEMO_CHANGES */
 
       gtk_grab_add (GTK_WIDGET (tree_view));
@@ -8125,20 +8118,7 @@
 
 #ifdef MAEMO_CHANGES
   /* Clear pending actions on row */
-  if (tree_view->priv->queued_expand_row)
-    {
-      gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
-      tree_view->priv->queued_expand_row = NULL;
-    }
-
-  if (tree_view->priv->queued_tapped_row)
-    {
-      gtk_tree_row_reference_free (tree_view->priv->queued_tapped_row);
-      tree_view->priv->queued_tapped_row = NULL;
-    }
-
-  free_queued_select_row (tree_view);
-  free_queued_activate_row (tree_view);
+  free_queued_actions (tree_view);
 #endif /* MAEMO_CHANGES */
 
 
@@ -12151,14 +12131,7 @@
       tree_view->priv->scroll_to_path = NULL;
 
 #ifdef MAEMO_CHANGES
-      gtk_tree_row_reference_free (tree_view->priv->queued_select_row);
-      tree_view->priv->queued_select_row = NULL;
-      gtk_tree_row_reference_free (tree_view->priv->queued_activate_row);
-      tree_view->priv->queued_activate_row = NULL;
-      gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
-      tree_view->priv->queued_expand_row = NULL;
-      gtk_tree_row_reference_free (tree_view->priv->queued_tapped_row);
-      tree_view->priv->queued_tapped_row = NULL;
+      free_queued_actions (tree_view);
 #endif /* MAEMO_CHANGES */
 
       tree_view->priv->scroll_to_column = NULL;
@@ -17374,6 +17347,19 @@
   tree_view->priv->queued_activate_row = NULL;
 }
 
+static void
+free_queued_actions (GtkTreeView *tree_view)
+{
+  free_queued_activate_row (tree_view);
+  free_queued_select_row (tree_view);
+
+  gtk_tree_row_reference_free (tree_view->priv->queued_expand_row);
+  tree_view->priv->queued_expand_row = NULL;
+
+  gtk_tree_row_reference_free (tree_view->priv->queued_tapped_row);
+  tree_view->priv->queued_tapped_row = NULL;
+}
+
 HildonUIMode
 hildon_tree_view_get_hildon_ui_mode (GtkTreeView *tree_view)
 {