Change FSF Address

[~andy/gtk] / gtk / gtkapplication.c

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 7ca5a8ef77673b3ae0dfee3268c8304581dbb3ec..c82577723712f590e6a5ad42044396d4def5e26d 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
@@ -110,9 +108,6 @@
  * property) and offers various functionality related to the session
  * life-cycle.
  *
- * An application can be informed when the session is about to end
- * by connecting to the #GtkApplication::quit signal.
- *
  * An application can block various ways to end the session with
  * the gtk_application_inhibit() function. Typical use cases for
  * this kind of inhibiting are long-running, uninterruptible operations,
@@ -750,9 +745,7 @@ gtk_application_class_init (GtkApplicationClass *class)
   /**
    * GtkApplication:register-session:
    *
-   * Set this property to %TRUE to register with the session manager
-   * and receive the #GtkApplication::quit signal when the session
-   * is about to end.
+   * Set this property to %TRUE to register with the session manager.
    *
    * Since: 3.4
    */
@@ -1495,8 +1488,11 @@ idle_will_quit (gpointer data)
                                       _("%s cannot quit at this time:\n\n%s"),
                                       g_get_application_name (),
                                       inhibitor->reason);
-      gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
+      g_signal_connect_swapped (dialog,
+                                "response",
+                                G_CALLBACK (gtk_widget_destroy),
+                                dialog);
+      gtk_widget_show_all (dialog);
     }
 
   return G_SOURCE_REMOVE;