projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-window: Avoid writing null pointer constant as '\0'.
[pspp]
/
src
/
ui
/
gui
/
psppire-spreadsheet-model.c
diff --git
a/src/ui/gui/psppire-spreadsheet-model.c
b/src/ui/gui/psppire-spreadsheet-model.c
index d02c1c558c94bcc937ea16881849e95bac4a17f3..d426b556616d143870eb6f0ce096894425b1d3f8 100644
(file)
--- a/
src/ui/gui/psppire-spreadsheet-model.c
+++ b/
src/ui/gui/psppire-spreadsheet-model.c
@@
-14,7
+14,7
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-/* This file implements a GtkTreeModel. It allows GtkComboBox and
+/* This file implements a GtkTreeModel. It allows GtkComboBox and
GtkTreeView to display the names and non-empty cell ranges of the
sheets aka "Tables" of spreadsheet files.
It doesn't take any notice of the spreadsheet data itself.
GtkTreeView to display the names and non-empty cell ranges of the
sheets aka "Tables" of spreadsheet files.
It doesn't take any notice of the spreadsheet data itself.
@@
-99,13
+99,14
@@
psppire_spreadsheet_model_set_property (GObject * object,
const GValue * value,
GParamSpec * pspec)
{
const GValue * value,
GParamSpec * pspec)
{
- PsppireSpreadsheetModel *spreadsheetModel =
+ PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (object);
switch (prop_id)
{
case PROP_SPREADSHEET:
spreadsheetModel->spreadsheet = g_value_get_pointer (value);
PSPPIRE_SPREADSHEET_MODEL (object);
switch (prop_id)
{
case PROP_SPREADSHEET:
spreadsheetModel->spreadsheet = g_value_get_pointer (value);
+ spreadsheet_ref (spreadsheetModel->spreadsheet);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@
-117,6
+118,14
@@
psppire_spreadsheet_model_set_property (GObject * object,
static void
psppire_spreadsheet_model_dispose (GObject * object)
{
static void
psppire_spreadsheet_model_dispose (GObject * object)
{
+ PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object);
+
+ if (!spreadsheetModel->dispose_has_run)
+ {
+ spreadsheet_unref (spreadsheetModel->spreadsheet);
+
+ spreadsheetModel->dispose_has_run = TRUE;
+ }
}
static void
}
static void
@@
-257,7
+266,7
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
const char *x =
spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
(intptr_t) iter->user_data);
const char *x =
spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
(intptr_t) iter->user_data);
-
+
g_value_set_string (value, x);
}
break;
g_value_set_string (value, x);
}
break;
@@
-343,7
+352,7
@@
tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent
iter->stamp = spreadsheetModel->stamp;
iter->user_data = 0;
iter->stamp = spreadsheetModel->stamp;
iter->user_data = 0;
-
+
return TRUE;
}
return TRUE;
}