Session Menu

Merge lp:~cjcurran/indicator-session/null-error-user-dbus-mgr into lp:indicator-session/0.1

  1. null-error-user-dbus-mgr
  2. Merge into trunk
Proposed by Conor Curran
Status: Merged
Approved by: Ted Gould
Approved revision: 203
Merged at revision: 206
Proposed branch: lp:~cjcurran/indicator-session/null-error-user-dbus-mgr
Merge into: lp:indicator-session/0.1
Diff against target: 17 lines (+5/-3)
1 file modified
src/users-service-dbus.c (+5/-3)
To merge this branch: bzr merge lp:~cjcurran/indicator-session/null-error-user-dbus-mgr
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+74080@code.launchpad.net

Description of the change

fixes the bug attached

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/users-service-dbus.c'
2--- src/users-service-dbus.c 2011-08-22 19:24:56 +0000
3+++ src/users-service-dbus.c 2011-09-05 11:28:25 +0000
4@@ -931,9 +931,11 @@
5 G_TYPE_BOOLEAN, &can_activate,
6 G_TYPE_INVALID))
7 {
8- g_warning ("Failed to determine if seat can activate sessions: %s", error->message);
9- g_error_free (error);
10-
11+ if (error != NULL){
12+ g_warning ("Failed to determine if seat can activate sessions: %s",
13+ error->message);
14+ g_error_free (error);
15+ }
16 return FALSE;
17 }
18

Subscribers

People subscribed via source and target branches