gnome-utils r8325 - trunk/logview

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:28:29 2008
New Revision: 8325
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8325&view=rev

Log:
Use time_t instead of GTimeVal and fix a bug when setting the invisible
tag for day selection.

Modified:
   trunk/logview/logview-log.c
   trunk/logview/logview-log.h
   trunk/logview/logview-window.c

Modified: trunk/logview/logview-log.c
==============================================================================
--- trunk/logview/logview-log.c	(original)
+++ trunk/logview/logview-log.c	Tue Dec 23 13:28:29 2008
@@ -50,7 +50,7 @@
   GFileMonitor *mon;
 
   /* stats about the file */
-  GTimeVal file_time;
+  time_t file_time;
   goffset file_size;
   char *display_name;
 
@@ -203,7 +203,7 @@
   int res;
   Day *day, *last;
 
-  new_days = log_read_dates (new_lines, log->priv->file_time.tv_sec);
+  new_days = log_read_dates (new_lines, log->priv->file_time);
 
   /* the days are stored in chronological order, so we compare the last cached
    * one with the new we got.
@@ -611,6 +611,7 @@
   char *buffer;
   GFileType type;
   GError *err = NULL;
+  GTimeVal timeval;
   gboolean is_archive;
 
   info = g_file_query_info (f,
@@ -644,7 +645,8 @@
   }
 
   log->priv->file_size = g_file_info_get_size (info);
-  g_file_info_get_modification_time (info, &log->priv->file_time);
+  g_file_info_get_modification_time (info, &timeval);
+  log->priv->file_time = timeval.tv_sec;
   log->priv->display_name = g_strdup (g_file_info_get_display_name (info));
 
   g_object_unref (info);
@@ -667,7 +669,7 @@
     guchar * buffer;
     gsize bytes_read;
     GInputStream *real_is;
-    time_t mtime;
+    time_t mtime; /* seconds */
 
     /* this also skips the header from |is| */
     res = read_gzip_header (is, &mtime);
@@ -679,6 +681,8 @@
       goto out;
     }
 
+    log->priv->file_time = mtime;
+
     gz = gz_handle_new (f, is);
     res = gz_handle_init (gz);
 
@@ -807,12 +811,12 @@
   return log->priv->display_name;
 }
 
-gulong
+time_t
 logview_log_get_timestamp (LogviewLog *log)
 {
   g_assert (LOGVIEW_IS_LOG (log));
 
-  return log->priv->file_time.tv_sec;
+  return log->priv->file_time;
 }
 
 goffset
@@ -875,4 +879,7 @@
   g_assert (LOGVIEW_IS_LOG (log));
 
   return g_object_ref (log->priv->file);
-}
\ No newline at end of file
+}
+
+
+

Modified: trunk/logview/logview-log.h
==============================================================================
--- trunk/logview/logview-log.h	(original)
+++ trunk/logview/logview-log.h	Tue Dec 23 13:28:29 2008
@@ -93,7 +93,7 @@
                                                     gpointer user_data);
 
 const char *  logview_log_get_display_name          (LogviewLog *log);
-gulong        logview_log_get_timestamp             (LogviewLog *log);
+time_t        logview_log_get_timestamp             (LogviewLog *log);
 goffset       logview_log_get_file_size             (LogviewLog *log);
 const char ** logview_log_get_cached_lines          (LogviewLog *log);
 guint         logview_log_get_cached_lines_number   (LogviewLog *log);

Modified: trunk/logview/logview-window.c
==============================================================================
--- trunk/logview/logview-window.c	(original)
+++ trunk/logview/logview-window.c	Tue Dec 23 13:28:29 2008
@@ -181,7 +181,7 @@
 {
   char *statusbar_text;
   char *size, *modified, *index;
-  gulong timestamp;
+  time_t timestamp;
 
   if (active == NULL) {
     gtk_statusbar_pop (GTK_STATUSBAR (logview->priv->statusbar), 0);
@@ -687,7 +687,7 @@
 
   gtk_text_buffer_get_start_iter (buffer, &start_iter);
   gtk_text_buffer_get_iter_at_line (buffer, &start_vis, first_line);
-  gtk_text_buffer_get_iter_at_line (buffer, &end_vis, last_line);
+  gtk_text_buffer_get_iter_at_line (buffer, &end_vis, last_line + 1);
   gtk_text_buffer_get_end_iter (buffer, &end_iter);
 
   /* clear all previous invisible tags */