Changeset 5b85d19

Timestamp:

Jul 3, 2003, 10:46:22 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9ceee9d

Parents:

de03334

Message:

Idle time reported in minutes, not seconds

Files:

• ChangeLog (modified) (1 diff)
• buddylist.c (modified) (2 diffs)
• commands.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• util.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.7-pre-2
+        Don't allow zwrite if zephyr isn't present
+        
 2.0.7-pre-1
         Owl should build now without zephyr, enabling it to act as a

buddylist.c

@@ -125 +125 @@
  * screenname is not on the buddy list do nothing
  */
-void owl_buddylist_set_idletime(owl_buddylist *b, char *screenname, int seconds)
+void owl_buddylist_set_idletime(owl_buddylist *b, char *screenname, int minutes)
 {
   int i, j, *idle;
@@ -134 +134 @@
       owl_free(owl_list_get_element(&(b->idletimes), i));
       idle=owl_malloc(sizeof(int));
-      *idle=seconds;
+      *idle=minutes;
       owl_list_replace_element(&(b->idletimes), i, idle);
       return;

commands.c

@@ -1610 +1610 @@
   owl_zwrite z;
 
+  if (!owl_global_is_havezephyr(&g)) {
+    owl_function_makemsg("Zephyr is not available");
+    return(NULL);
+  }
   /* check for a zwrite -m */
   owl_zwrite_create_from_line(&z, buff);

functions.c

@@ -2865 +2865 @@
       idle=owl_buddylist_get_idletime(b, i);
       if (idle!=0) {
-        timestr=owl_util_seconds_to_timestr(idle);
+        timestr=owl_util_minutes_to_timestr(idle);
       } else {
         timestr=owl_strdup("");
       }
-      foo=owl_sprintf("  %-10.10s %-15.15s\n",
+      foo=owl_sprintf("  %-10.10s %-10.10s\n",
                       owl_buddylist_get_buddy(b, i),
                       timestr);

owl.h

@@ -21 +21 @@
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.7-pre-1
-#define OWL_VERSION_STRING "2.0.7-pre-1"
+#define OWL_VERSION         2.0.7-pre-2
+#define OWL_VERSION_STRING "2.0.7-pre-2"
 
 #define OWL_DEBUG 0

util.c

@@ -281 +281 @@
 
 /* caller must free the return */
-char *owl_util_seconds_to_timestr(int seconds)
+char *owl_util_minutes_to_timestr(int in)
 {
   int days, minutes, hours;
@@ -287 +287 @@
   char *out;
 
-  run=seconds;
-
-  days=run/86400;
-  run-=days*86400;
-  hours=run/3600;
-  run-=hours*3600;
-  minutes=run/60;
-  run-=minutes*60;
+  run=in;
+
+  days=run/1440;
+  run-=days*1440;
+  hours=run/60;
+  run-=hours*60;
 
   if (days>0) {
-    out=owl_sprintf("%i d %2.2i:%2.2i:%2.2li", days, hours, minutes, run);
+    out=owl_sprintf("%i d %2.2i:%2.2i", days, hours, run);
   } else {
-    out=owl_sprintf("     %2.2i:%2.2i:%2.2li", hours, minutes, run);
+    out=owl_sprintf("     %2.2i:%2.2i", hours, run);
   }
   return(out);