projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-data-sheet: Implement Edit|Paste.
[pspp]
/
src
/
ui
/
gui
/
psppire-dict.c
diff --git
a/src/ui/gui/psppire-dict.c
b/src/ui/gui/psppire-dict.c
index 04bd3e319ce82052c6a857375e0828f0ae6ccc5f..e6291b69c465535ee94434908070a9b78772d031 100644
(file)
--- a/
src/ui/gui/psppire-dict.c
+++ b/
src/ui/gui/psppire-dict.c
@@
-56,7
+56,7
@@
enum {
/* --- prototypes --- */
static void psppire_dict_class_init (PsppireDictClass *class);
static void psppire_dict_init (PsppireDict *dict);
/* --- prototypes --- */
static void psppire_dict_class_init (PsppireDictClass *class);
static void psppire_dict_init (PsppireDict *dict);
-static void psppire_dict_
finalize
(GObject *object);
+static void psppire_dict_
dispose
(GObject *object);
static void dictionary_tree_model_init (GtkTreeModelIface *iface);
static void dictionary_tree_model_init (GtkTreeModelIface *iface);
@@
-115,7
+115,7
@@
psppire_dict_class_init (PsppireDictClass *class)
parent_class = g_type_class_peek_parent (class);
parent_class = g_type_class_peek_parent (class);
- object_class->
finalize = psppire_dict_finaliz
e;
+ object_class->
dispose = psppire_dict_dispos
e;
signals [BACKEND_CHANGED] =
g_signal_new ("backend-changed",
signals [BACKEND_CHANGED] =
g_signal_new ("backend-changed",
@@
-129,7
+129,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signals [VARIABLE_CHANGED] =
signals [VARIABLE_CHANGED] =
- g_signal_new ("variable
_
changed",
+ g_signal_new ("variable
-
changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
@@
-142,7
+142,7
@@
psppire_dict_class_init (PsppireDictClass *class)
signals [VARIABLE_INSERTED] =
signals [VARIABLE_INSERTED] =
- g_signal_new ("variable
_
inserted",
+ g_signal_new ("variable
-
inserted",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_FIRST,
0,
@@
-227,13
+227,13
@@
psppire_dict_class_init (PsppireDictClass *class)
}
static void
}
static void
-psppire_dict_
finaliz
e (GObject *object)
+psppire_dict_
dispos
e (GObject *object)
{
PsppireDict *d = PSPPIRE_DICT (object);
{
PsppireDict *d = PSPPIRE_DICT (object);
- dict_
destroy (d->dict
);
+ dict_
set_callbacks (d->dict, NULL, NULL
);
- G_OBJECT_CLASS (parent_class)->
finaliz
e (object);
+ G_OBJECT_CLASS (parent_class)->
dispos
e (object);
}
/* Pass on callbacks from src/data/dictionary, as
}
/* Pass on callbacks from src/data/dictionary, as