Attachment 31728 Details for Bug 25436 – patch to show full name

[patch] patch to show full name

ConsoleKit-11-ck-history.diff (text/plain), 2.74 KB, created by Halton Huo on 2009-12-04 00:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Halton Huo

Created: 2009-12-04 00:10:34 UTC

Size: 2.74 KB

patch

obsolete

>diff --git a/tools/ck-history.c b/tools/ck-history.c
>index 606106c..e7659d1 100644
>--- a/tools/ck-history.c
>+++ b/tools/ck-history.c
>@@ -60,6 +60,8 @@ typedef enum {
> #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history"
> #define MAX_LINE_LEN 2048
> 
>+#define IS_STR_SET(x) (x != NULL && x[0] != '\0')
>+
> static GList *all_events = NULL;
> 
> static gboolean
>@@ -515,21 +517,21 @@ print_last_report_record (GList      *list,
> 
>         if (legacy_compat) {
>                 g_string_printf (str,
>-                                 "%-8.8s %-12.12s %-16.16s %-16.16s",
>-                                 username,
>-                                 utline != NULL ? utline : "",
>-                                 host != NULL ? host : "",
>-                                 addedtime);
>+                                 "%s\t%s\t%s\t%s",
>+                                 IS_STR_SET (username) ? username : "NULL",
>+                                 IS_STR_SET (utline) ? utline : "NULL",
>+                                 IS_STR_SET (host) ? host : "NULL",
>+                                 IS_STR_SET (addedtime) ? addedtime : "NULL");
>         } else {
>                 g_string_printf (str,
>-                                 "%-8.8s %12s %-10.10s %-7.7s %-12.12s %-28.28s %-16.16s",
>-                                 username,
>-                                 session_type,
>-                                 session_id,
>-                                 seat_id,
>-                                 utline,
>-                                 host != NULL ? host : "",
>-                                 addedtime);
>+                                 "%s\t%s\t%s\t%s\t%s\t%s\t%s",
>+                                 IS_STR_SET (username) ? username : "NULL",
>+                                 IS_STR_SET (session_type) ? session_type : "NULL",
>+                                 IS_STR_SET (session_id) ? session_id : "NULL",
>+                                 IS_STR_SET (seat_id) ? seat_id : "NULL",
>+                                 IS_STR_SET (utline) ? utline : "NULL",
>+                                 IS_STR_SET (host) ? host : "NULL",
>+                                 IS_STR_SET (addedtime) ? addedtime : "NULL");
>         }
> 
>         g_free (username);
>@@ -576,9 +578,9 @@ print_last_report_record (GList      *list,
>         }
> 
>         g_string_append_printf (str,
>-                                " %-7.7s %-12.12s",
>-                                removedtime,
>-                                duration);
>+                                "\t%s\t%s",
>+                                IS_STR_SET (removedtime) ? removedtime : "NULL",
>+                                IS_STR_SET (duration) ? duration : "NULL");
> 
>         g_print ("%s\n", str->str);
>         g_string_free (str, TRUE);

Actions: View | Splinter Review

Attachments on bug 25436: 31728

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.