projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments dialog: convert to PsppireDialogAction
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog-action.c
diff --git
a/src/ui/gui/psppire-dialog-action.c
b/src/ui/gui/psppire-dialog-action.c
index 70b89ea2867c2d2b8378bfde2a7f8a83ad394c84..6bd1645460c876d9251b75648de54198fbf84c0e 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action.c
+++ b/
src/ui/gui/psppire-dialog-action.c
@@
-143,8
+143,8
@@
psppire_dialog_action_activate (PsppireDialogAction *act)
set_toplevel (act);
act->dict = PSPPIRE_DATA_WINDOW(act->toplevel)->dict;
set_toplevel (act);
act->dict = PSPPIRE_DATA_WINDOW(act->toplevel)->dict;
-
- g_object_set (act->source, "model", act->dict, NULL);
+ if (act->source)
+
g_object_set (act->source, "model", act->dict, NULL);
GSList *wl = g_object_get_data (G_OBJECT (act->toplevel), "widget-list");
wl = g_slist_prepend (wl, act->dialog);
GSList *wl = g_object_get_data (G_OBJECT (act->toplevel), "widget-list");
wl = g_slist_prepend (wl, act->dialog);
@@
-155,7
+155,8
@@
psppire_dialog_action_activate (PsppireDialogAction *act)
if (GTK_ACTION_CLASS (psppire_dialog_action_parent_class)->activate)
GTK_ACTION_CLASS (psppire_dialog_action_parent_class)->activate ( GTK_ACTION (act));
if (GTK_ACTION_CLASS (psppire_dialog_action_parent_class)->activate)
GTK_ACTION_CLASS (psppire_dialog_action_parent_class)->activate ( GTK_ACTION (act));
- gtk_widget_grab_focus (act->source);
+ if (act->source)
+ gtk_widget_grab_focus (act->source);
if (first_time)
psppire_dialog_reload (PSPPIRE_DIALOG (act->dialog));
if (first_time)
psppire_dialog_reload (PSPPIRE_DIALOG (act->dialog));