← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-session/raring

« back to all changes in this revision

Viewing changes to gnome-session/gsm-shell.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-07-29 16:22:23 UTC
  • mfrom: (1.1.78)
  • Revision ID: package-import@ubuntu.com-20120729162223-zvvdhbwa7s8r0zdx
Tags: 3.5.4-0ubuntu1
* New upstream release
* debian/control:
  - Bump build-depends on libglib2.0-dev
* debian/patches/21_up_start_on_demand.patch:
  - Dropped, code has changed too much

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-session/gsm-shell.c
516
516
on_end_session_dialog_canceled (DBusGProxy *proxy,
517
517
                                GsmShell   *shell)
518
518
{
 
519
        if (shell->priv->update_idle_id != 0) {
 
520
                g_source_remove (shell->priv->update_idle_id);
 
521
                shell->priv->update_idle_id = 0;
 
522
        }
 
523
 
 
524
        g_signal_handlers_disconnect_by_func (shell->priv->inhibitors,
 
525
                                              G_CALLBACK (queue_end_session_dialog_update),
 
526
                                              shell);
 
527
 
519
528
        g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CANCELED], 0);
520
529
}
521
530