Changeset 42a0c8b

Timestamp:

Sep 16, 2011, 1:16:26 AM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

732d5c0 (diff), 6edc38b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 6edc38b038b3087836f5666d5f0b5820e4499c2c into 732d5c0e9d9ef138feef0e02f8c2ad5840e830a2

Files:

• perl/lib/BarnOwl/Complete/Client.pm (modified) (1 diff)
• functions.c (modified) (6 diffs)
• message.c (modified) (3 diffs)
• perl/lib/BarnOwl/Style/Default.pm (modified) (1 diff)
• util.c (modified) (2 diffs)

perl/lib/BarnOwl/Complete/Client.pm

@@ -205 +205 @@
 BarnOwl::Completion::register_completer(set     => \&complete_set);
 BarnOwl::Completion::register_completer(unset   => \&complete_set);
-BarnOwl::Completion::register_completer(startup => \&complete_startup);
+BarnOwl::Completion::register_completer(startup   => \&complete_startup);
+BarnOwl::Completion::register_completer(unstartup => \&complete_startup);
 BarnOwl::Completion::register_completer(bindkey => \&complete_bindkey);
 BarnOwl::Completion::register_completer(print   => \&complete_print);

functions.c

@@ -1223 +1223 @@
   now = time(NULL);
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&now));
+  tmpbuff = owl_util_format_time(localtime(&now));
   fprintf(file, "[%d -  %s - %lds]: ",
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
@@ -1373 +1373 @@
   owl_fmtext fm, attrfm;
   const owl_view *v;
+  char *time;
 #ifdef HAVE_LIBZEPHYR
   const ZNotice_t *n;
@@ -1403 +1404 @@
   }
 
-  owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", owl_message_get_timestr(m));
+  time = owl_message_format_time(m);
+  owl_fmtext_appendf_normal(&fm, "  Time      : %s\n", time);
+  g_free(time);
 
   if (!owl_message_is_type_admin(m)) {
@@ -1776 +1779 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  tmpbuff = owl_util_time_to_timestr(localtime(&start));
+  tmpbuff = owl_util_format_time(localtime(&start));
   owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
   g_free(tmpbuff);
@@ -3072 +3075 @@
       idle=owl_buddy_get_idle_time(b);
       if (idle!=0) {
-        timestr=owl_util_minutes_to_timestr(idle);
+        timestr=owl_util_format_minutes(idle);
       } else {
         timestr=g_strdup("");
@@ -3401 +3404 @@
 
   now = time(NULL);
-  date = owl_util_time_to_timestr(localtime(&now));
+  date = owl_util_format_time(localtime(&now));
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -43 +43 @@
   /* save the time */
   m->time = time(NULL);
-  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   m->fmtext = NULL;
@@ -344 +345 @@
   if (m->timestr) return(m->timestr);
   return("");
+}
+
+CALLER_OWN char *owl_message_format_time(const owl_message *m)
+{
+  return owl_util_format_time(localtime(&m->time));
 }
 
@@ -793 +799 @@
   if (m->timestr) g_free(m->timestr);
   m->time = n->z_time.tv_sec;
-  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   /* set other info */

perl/lib/BarnOwl/Style/Default.pm

@@ -113 +113 @@
         }
         $header .= '@b{' . maybe($m->pretty_sender) . '}';
+        if (defined($m->realm) && $m->realm ne BarnOwl::zephyr_getrealm()) {
+            $header .= ' {' . $self->humanize($m->realm, 1) . '}';
+        }
     }
 

util.c

@@ -268 +268 @@
 
 /* caller must free the return */
-CALLER_OWN char *owl_util_minutes_to_timestr(int in)
+CALLER_OWN char *owl_util_format_minutes(int in)
 {
   int days, hours;
@@ -289 +289 @@
 }
 
-CALLER_OWN char *owl_util_time_to_timestr(const struct tm *time)
+CALLER_OWN char *owl_util_format_time(const struct tm *time)
 {
   /* 32 chosen for first attempt because timestr will end up being