[Xfce4-commits] r29504 - in xfce4-session/trunk: . settings

[Brian Tarricone]

Author: kelnos
Date: 2009-02-18 09:04:35 +0000 (Wed, 18 Feb 2009)
New Revision: 29504

Modified:
   xfce4-session/trunk/ChangeLog
   xfce4-session/trunk/NEWS
   xfce4-session/trunk/settings/xfae-window.c
Log:
	* settings/xfae-window.c: Fix a crash in xfce4-session-settings when
	  trying to add a new autostarted application. XfaeWindow is no longer
	  a GtkWindow and can thus not be used as a parent in
	  gtk_window_set_transient_for() anymore (bug 4934).

Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog	2009-02-17 21:51:47 UTC (rev 29503)
+++ xfce4-session/trunk/ChangeLog	2009-02-18 09:04:35 UTC (rev 29504)
@@ -1,3 +1,10 @@
+2009-02-13	Jannis Pohlmann <jannis at xfce.org>
+
+	* settings/xfae-window.c: Fix a crash in xfce4-session-settings when
+	  trying to add a new autostarted application. XfaeWindow is no longer
+	  a GtkWindow and can thus not be used as a parent in
+	  gtk_window_set_transient_for() anymore (bug 4934).
+
 2009-02-01	Brian Tarricone <bjt23 at cornell.edu>
 
 	* xfce4-session/xfsm-shutdown-helper.c: Fix sudo shutdown helper;

Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS	2009-02-17 21:51:47 UTC (rev 29503)
+++ xfce4-session/trunk/NEWS	2009-02-18 09:04:35 UTC (rev 29504)
@@ -5,6 +5,7 @@
 - Fix sudo shutdown helper for sysetms without HAL (bug 4849).
 - Avoid a spurious error dialog when using the sudo shutdown helper
   to shut down the system (bug 4849).
+- Fix crash in autostart editor when adding a new app (bug 4934).
 
 4.5.99.1 (Xfce 4.6rc1)
 ======================

Modified: xfce4-session/trunk/settings/xfae-window.c
===================================================================
--- xfce4-session/trunk/settings/xfae-window.c	2009-02-17 21:51:47 UTC (rev 29503)
+++ xfce4-session/trunk/settings/xfae-window.c	2009-02-18 09:04:35 UTC (rev 29504)
@@ -257,6 +257,7 @@
 xfae_window_add (XfaeWindow *window)
 {
   GtkTreeModel *model;
+  GtkWidget    *parent;
   GtkWidget    *dialog;
   GError       *error = NULL;
   gchar        *name;
@@ -264,7 +265,8 @@
   gchar        *command;
 
   dialog = xfae_dialog_new ();
-  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  parent = gtk_widget_get_toplevel (GTK_WIDGET (window));
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
       gtk_widget_hide (dialog);