projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
table-casereader: Put space between columns.
[pspp]
/
src
/
ui
/
gui
/
psppire-dialog.c
diff --git
a/src/ui/gui/psppire-dialog.c
b/src/ui/gui/psppire-dialog.c
index dbe4612f026a160f29592553894be93caff3e3ca..977f08e67eef5cb3c52ce6cfa90c8e257686d869 100644
(file)
--- a/
src/ui/gui/psppire-dialog.c
+++ b/
src/ui/gui/psppire-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ Copyright (C) 2007
, 2010, 2011
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
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
@@
-296,16
+296,16
@@
static gboolean
configure_event_callback (GtkDialog *dialog,
GdkEvent *event, gpointer data)
{
configure_event_callback (GtkDialog *dialog,
GdkEvent *event, gpointer data)
{
-
gchar *base = NULL
;
+
const gchar *base
;
PsppireConf *conf = psppire_conf_new ();
if ( ! GTK_WIDGET_MAPPED (dialog))
return FALSE;
PsppireConf *conf = psppire_conf_new ();
if ( ! GTK_WIDGET_MAPPED (dialog))
return FALSE;
-
g_object_get (dialog, "name", &base, NULL
);
+
base = gtk_buildable_get_name (GTK_BUILDABLE (dialog)
);
- psppire_conf_save_window_geometry (conf, base,
event
);
+ psppire_conf_save_window_geometry (conf, base,
GTK_WINDOW (dialog)
);
return FALSE;
}
return FALSE;
}
@@
-316,9
+316,7
@@
on_realize (GtkWindow *dialog, gpointer data)
{
PsppireConf *conf = psppire_conf_new ();
{
PsppireConf *conf = psppire_conf_new ();
- const gchar *base = NULL;
-
- g_object_get (dialog, "name", &base, NULL);
+ const gchar *base = gtk_buildable_get_name (GTK_BUILDABLE (dialog));
psppire_conf_set_window_geometry (conf, base, dialog);
}
psppire_conf_set_window_geometry (conf, base, dialog);
}
@@
-481,7
+479,7
@@
connect_notify_signal (GtkWidget *w, gpointer data)
while ((col = gtk_tree_view_get_column (tv, i++)))
{
while ((col = gtk_tree_view_get_column (tv, i++)))
{
- GList *renderers = gtk_
tree_view_column_get_cell_renderers (col
);
+ GList *renderers = gtk_
cell_layout_get_cells (GTK_CELL_LAYOUT (col)
);
GList *start = renderers;
while (renderers)
{
GList *start = renderers;
while (renderers)
{
@@
-513,7
+511,9
@@
psppire_dialog_run (PsppireDialog *dialog)
g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
g_signal_emit (dialog, signals [DIALOG_REFRESH], 0);
+ gdk_threads_leave ();
g_main_loop_run (dialog->loop);
g_main_loop_run (dialog->loop);
+ gdk_threads_enter ();
g_main_loop_unref (dialog->loop);
g_main_loop_unref (dialog->loop);