← Back to branch summary

~allanlesage/indicator-messages/TDD

« back to all changes in this revision

Viewing changes to src/messages-service.c

  • Committer: Lars Uebernickel
  • Date: 2012-02-10 16:44:16 UTC
  • mfrom: (233.3.8 trunk)
  • Revision ID: lars.uebernickel@canonical.com-20120210164416-lk04q0o1t46deyp0
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/messages-service.c
104
104
        pa = (serverList_t *)a;
105
105
        pb = (serverList_t *)b;
106
106
 
107
 
        const gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server);
108
 
        const gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server);
 
107
        const gchar * pan = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server);
 
108
        const gchar * pbn = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server);
 
109
        const gchar * pap = indicate_listener_server_get_dbuspath(pa->server);
 
110
        const gchar * pbp = indicate_listener_server_get_dbuspath(pb->server);
109
111
 
110
 
        return g_strcmp0(pas, pbs);
 
112
        if (g_strcmp0(pan, pbn) == 0)
 
113
          return g_strcmp0(pap, pbp);
 
114
        else
 
115
          return 1;
111
116
}
112
117
 
113
118
static gint
1296
1301
        g_file_get_contents(path, &desktop, NULL, NULL);
1297
1302
 
1298
1303
        if (desktop == NULL) {
 
1304
                g_free(path);
1299
1305
                return FALSE;
1300
1306
        }
1301
1307
 
1305
1311
 
1306
1312
        build_launcher_core(trimdesktop);
1307
1313
        g_free(trimdesktop);
 
1314
        g_free(path);
1308
1315
        return FALSE;
1309
1316
}
1310
1317
 
1318
1325
                build_launcher_core(desktop);
1319
1326
                g_free(desktop);
1320
1327
        }
 
1328
        g_free(path);
1321
1329
        return FALSE;
1322
1330
}
1323
1331