fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-30 23:48:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "core: aggregate ConsoleKit sesson data (rh #647454)"

Browse source 
This reverts commit 328068c7fe.

The bug tag in the commit message is wrong, it should be
bgo and not rh.
This commit is contained in:
Dan Williams 2011-04-11 16:43:01 -05:00
parent 328068c7fe
commit 5cd14f05b7
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/nm-session-monitor.c
View file

@ -189,19 +189,6 @@ error:
return NULL;
}
static void
session_merge (Session *src, Session *dest)
{
g_return_if_fail (src != NULL);
g_return_if_fail (dest != NULL);
g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
g_warn_if_fail (src->uid == dest->uid);
dest->local = (dest->local || src->local);
dest->active = (dest->active || src->active);
}
/********************************************************************/
static void
@ -250,24 +237,14 @@ reload_database (NMSessionMonitor *self, GError **error)
}
for (i = 0; i < len; i++) {
Session *found;
if (!g_str_has_prefix (groups[i], "Session "))
continue;
s = session_new (self->database, groups[i], error);
if (!s)
goto error;
found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
if (found) {
session_merge (s, found);
session_free (s);
} else {
/* Entirely new user */
g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
}
g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
}
g_strfreev (groups);