X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dictview.c;h=40a131b72bd5345ac1580498c30610a32d820288;hb=8a6611e7e3bbba8be61cd35f8701f50d6e255e44;hp=7893dcf34d5cc902fcdc9c7f3d5af6cc6b9464f9;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp

diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c
index 7893dcf34d..40a131b72b 100644
--- a/src/ui/gui/psppire-dictview.c
+++ b/src/ui/gui/psppire-dictview.c
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2017  Free Software Foundation
+   Copyright (C) 2009, 2010, 2011, 2012, 2013, 2017,
+   2020  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -113,14 +114,18 @@ unsorted (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
-
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+  gint rval = compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 static gint
@@ -129,13 +134,18 @@ sort_by_name (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+  gint rval =  g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 
@@ -145,13 +155,18 @@ sort_by_label (GtkTreeModel *model,
      GtkTreeIter *b,
      gpointer user_data)
 {
-  const struct variable *var_a;
-  const struct variable *var_b;
+  struct variable *var_a;
+  struct variable *var_b;
 
   gtk_tree_model_get (model, a, DICT_TVM_COL_VAR,  &var_a, -1);
   gtk_tree_model_get (model, b, DICT_TVM_COL_VAR,  &var_b, -1);
 
-  return g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+  gint rval = g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
 }
 
 
@@ -189,7 +204,7 @@ set_model (PsppireDictView *dict_view)
 {
   GtkTreeModel *model = NULL;
 
-  if ( dict_view->dict == NULL)
+  if (dict_view->dict == NULL)
     return;
 
   dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict));
@@ -197,7 +212,7 @@ set_model (PsppireDictView *dict_view)
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
 					GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
 
-   if ( dict_view->predicate )
+   if (dict_view->predicate)
     {
       model = gtk_tree_model_filter_new (dict_view->sorted_model,	 NULL);
 
@@ -389,6 +404,8 @@ var_description_cell_data_func (GtkTreeViewColumn *col,
     {
       g_object_set (cell, "text", var_get_name (var), NULL);
     }
+
+  var_unref (var);
 }
 
 
@@ -411,6 +428,8 @@ var_icon_cell_data_func (GtkTreeViewColumn *col,
 		"icon-name", get_var_measurement_stock_id (var_get_print_format (var)->type,
 							   var_get_measure (var)),
                 NULL);
+
+  var_unref (var);
 }
 
 const char *
@@ -488,11 +507,13 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
   if (!ok)
     return FALSE;
 
-
   gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR,  &var, -1);
 
-  if ( ! var_has_label (var))
-    return FALSE;
+  if (! var_has_label (var))
+    {
+      var_unref (var);
+      return FALSE;
+    }
 
   {
     const gchar *tip ;
@@ -500,7 +521,7 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
 
     get_base_model (tree_model, NULL, &m, NULL);
 
-    if ( use_labels (PSPPIRE_DICT_VIEW (treeview)))
+    if (use_labels (PSPPIRE_DICT_VIEW (treeview)))
       tip = var_get_name (var);
     else
       tip = var_get_label (var);
@@ -508,17 +529,17 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
     gtk_tooltip_set_text (tooltip, tip);
   }
 
+  var_unref (var);
   return TRUE;
 }
 
 static gboolean
-show_menu (PsppireDictView *dv, GdkEventButton *event, gpointer data)
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
 {
-  if (event->button != 3)
+  if (((GdkEventButton *) event)->button != 3)
     return FALSE;
 
-  gtk_menu_popup (GTK_MENU (dv->menu), NULL, NULL, NULL, NULL,
-		  event->button, event->time);
+  gtk_menu_popup_at_pointer (GTK_MENU (dv->menu), event);
 
   return TRUE;
 }
@@ -758,5 +779,3 @@ psppire_dict_view_get_selected_variable (PsppireDictView *dict_view)
   else
     return NULL;
 }
-
-