dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't crash if gdk_display_get_name() returns NULL. 

2005-11-26  Michael Natterer  <mitch@gimp.org>

	* app/menus/window-menu.c (window_menu_display_opened,closed):
	don't crash if gdk_display_get_name() returns NULL.
This commit is contained in:
Michael Natterer 2005-11-26 23:03:40 +00:00 committed by Michael Natterer
parent 2a2e74161d
commit e5f046c33e
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-11-26 Michael Natterer <mitch@gimp.org>
* app/menus/window-menu.c (window_menu_display_opened,closed):
don't crash if gdk_display_get_name() returns NULL.
2005-11-26 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.c (gimp_display_shell_unrealize):

20
app/menus/window-menu.c
View File

@ -90,6 +90,7 @@ window_menu_display_opened (GdkDisplayManager *disp_manager,
GtkUIManager *ui_manager = GTK_UI_MANAGER (manager);
const gchar *group_name;
const gchar *ui_path;
const gchar *display_name;
gchar *action_path;
gchar *merge_key;
guint merge_id;
@ -103,8 +104,11 @@ window_menu_display_opened (GdkDisplayManager *disp_manager,
action_path = g_strdup_printf ("%s/Move to Screen", ui_path);
merge_key = g_strdup_printf ("%s-display-merge-id",
gdk_display_get_name (display));
display_name = gdk_display_get_name (display);
if (! display_name)
display_name = "eek";
merge_key = g_strdup_printf ("%s-display-merge-id", display_name);
merge_id = gtk_ui_manager_new_merge_id (ui_manager);
g_object_set_data (G_OBJECT (manager), merge_key,
@ -147,11 +151,15 @@ window_menu_display_closed (GdkDisplay *display,
gboolean is_error,
GimpUIManager *manager)
{
gchar *merge_key;
guint merge_id;
const gchar *display_name;
gchar *merge_key;
guint merge_id;
merge_key = g_strdup_printf ("%s-display-merge-id",
gdk_display_get_name (display));
display_name = gdk_display_get_name (display);
if (! display_name)
display_name = "eek";
merge_key = g_strdup_printf ("%s-display-merge-id", display_name);
merge_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (manager),
merge_key));
g_free (merge_key);