projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "psppsheet" to obtain bug fixes from "master".
[pspp]
/
src
/
ui
/
gui
/
pspp-sheet-view.c
diff --git
a/src/ui/gui/pspp-sheet-view.c
b/src/ui/gui/pspp-sheet-view.c
index 02825483ccc6d7d830b72db4ca86a19cbf31b765..c569d20403c201d967cbe7832349f71452141901 100644
(file)
--- a/
src/ui/gui/pspp-sheet-view.c
+++ b/
src/ui/gui/pspp-sheet-view.c
@@
-1266,7
+1266,6
@@
static void
pspp_sheet_view_finalize (GObject *object)
{
PsppSheetView *tree_view = PSPP_SHEET_VIEW (object);
pspp_sheet_view_finalize (GObject *object)
{
PsppSheetView *tree_view = PSPP_SHEET_VIEW (object);
- GList *list;
pspp_sheet_view_stop_editing (tree_view, TRUE);
pspp_sheet_view_stop_editing (tree_view, TRUE);
@@
-1519,6
+1518,8
@@
pspp_sheet_view_unrealize (GtkWidget *widget)
PsppSheetViewPrivate *priv = tree_view->priv;
GList *list;
PsppSheetViewPrivate *priv = tree_view->priv;
GList *list;
+ GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
+
if (priv->scroll_timeout != 0)
{
g_source_remove (priv->scroll_timeout);
if (priv->scroll_timeout != 0)
{
g_source_remove (priv->scroll_timeout);
@@
-1595,8
+1596,6
@@
pspp_sheet_view_unrealize (GtkWidget *widget)
}
tree_view->priv->columns = NULL;
}
}
tree_view->priv->columns = NULL;
}
-
- GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
}
/* GtkWidget::size_request helper */
}
/* GtkWidget::size_request helper */