combobox: popdown the combobox when on 'grab-broken-event'

[~andy/gtk] / gtk / gtktreemodelsort.c

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 82396a51226c3b57a1195ec44d609b78b11565fd..b2046c2d8ebf1472863c3a63a08e04fde7a59a38 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -13,9 +13,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -1127,7 +1125,6 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
        return;
       gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
 
-      level = SORT_LEVEL (iter.user_data);
       elt = SORT_ELT (iter.user_data2);
 
       if (!elt->children)
@@ -1376,14 +1373,12 @@ gtk_tree_model_sort_iter_next (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortLevel *level;
   SortElt *elt;
   GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
   g_return_val_if_fail (priv->stamp == iter->stamp, FALSE);
 
-  level = iter->user_data;
   elt = iter->user_data2;
 
   siter = g_sequence_iter_next (elt->siter);
@@ -1403,22 +1398,21 @@ gtk_tree_model_sort_iter_previous (GtkTreeModel *tree_model,
 {
   GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
   GtkTreeModelSortPrivate *priv = tree_model_sort->priv;
-  SortLevel *level;
   SortElt *elt;
   GSequenceIter *siter;
 
   g_return_val_if_fail (priv->child_model != NULL, FALSE);
   g_return_val_if_fail (priv->stamp == iter->stamp, FALSE);
 
-  level = iter->user_data;
   elt = iter->user_data2;
 
-  siter = g_sequence_iter_prev (elt->siter);
-  if (g_sequence_iter_is_begin (siter))
+  if (g_sequence_iter_is_begin (elt->siter))
     {
       iter->stamp = 0;
       return FALSE;
     }
+
+  siter = g_sequence_iter_prev (elt->siter);
   iter->user_data2 = GET_ELT (siter);
 
   return TRUE;