projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FACTOR: Fix a crash when bad input was presented
[pspp]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index 6fb0b87c47209d6992d43db005dc0ecc9621cc29..fa3b250fa50fa3d2e1e4306ce6c1448a70f90536 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-111,7
+111,7
@@
psppire_window_set_title (PsppireWindow *window)
int minor = 1;
sscanf (bare_version, "%*d.%d.%*d", &minor);
if (minor % 2)
int minor = 1;
sscanf (bare_version, "%*d.%d.%*d", &minor);
if (minor % 2)
- g_string_append
(title, " - UNRELEASED TEST SOFTWARE! NOT FOR PRODUCTION USE."
);
+ g_string_append
_printf (title, " - Test version! Please report bugs to %s", PACKAGE_BUGREPORT
);
gtk_window_set_title (GTK_WINDOW (window), title->str);
gtk_window_set_title (GTK_WINDOW (window), title->str);
@@
-196,7
+196,6
@@
psppire_window_set_property (GObject *object,
: NULL);
psppire_window_name_changed (window);
break;
: NULL);
psppire_window_name_changed (window);
break;
- break;
case PROP_ID:
g_free (window->id);
window->id = g_value_dup_string (value);
case PROP_ID:
g_free (window->id);
window->id = g_value_dup_string (value);
@@
-321,7
+320,7
@@
insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
filename = g_filename_display_name (key);
item = gtk_check_menu_item_new_with_label (filename);
g_free (filename);
filename = g_filename_display_name (key);
item = gtk_check_menu_item_new_with_label (filename);
g_free (filename);
-
+
g_hash_table_insert (window->menuitem_table, key, item);
}
g_hash_table_insert (window->menuitem_table, key, item);
}
@@
-341,7
+340,7
@@
static void
insert_menuitem (GObject *reg, const gchar *key, gpointer data)
{
PsppireWindow *window = PSPPIRE_WINDOW (data);
insert_menuitem (GObject *reg, const gchar *key, gpointer data)
{
PsppireWindow *window = PSPPIRE_WINDOW (data);
-
+
insert_menuitem_into_menu (window, (gpointer) key);
}
insert_menuitem_into_menu (window, (gpointer) key);
}
@@
-564,7
+563,7
@@
psppire_window_model_get_type (void)
window_model_type =
g_type_register_static (G_TYPE_INTERFACE, "PsppireWindowModel",
&window_model_info, 0);
window_model_type =
g_type_register_static (G_TYPE_INTERFACE, "PsppireWindowModel",
&window_model_info, 0);
-
+
g_type_interface_add_prerequisite (window_model_type, G_TYPE_OBJECT);
}
g_type_interface_add_prerequisite (window_model_type, G_TYPE_OBJECT);
}