--- a/patches/gnome-utils-04-logview-plugin.diff Sun Apr 15 05:51:22 2007 +0000
+++ b/patches/gnome-utils-04-logview-plugin.diff Mon Apr 16 05:35:05 2007 +0000
@@ -838,7 +838,7 @@
}
Index: gnome-utils/logview/logview.c
===================================================================
---- gnome-utils/logview/logview.c (revision 7448)
+--- gnome-utils/logview/logview.c (revision 7493)
+++ gnome-utils/logview/logview.c (working copy)
@@ -1,22 +1,22 @@
/* ----------------------------------------------------------------------
@@ -935,7 +935,7 @@
{ "MonitorLogs", NULL, N_("_Monitor"), "<control>M", N_("Monitor Current Log"),
G_CALLBACK (logview_toggle_monitor), TRUE },
{"ShowCalendar", NULL, N_("Ca_lendar"), "<control>L", N_("Show Calendar Log"),
-@@ -130,202 +133,241 @@
+@@ -130,202 +133,240 @@
};
static const char *ui_description =
@@ -1095,9 +1095,8 @@
+ Note that if choose a log path, then blank out all the Gui.
+ */
-+ if (logview->curlog != NULL) {
-+ logview_update_version_bar (logview);
-+ } else {
++ logview_update_version_bar (logview);
++ if (logview->curlog == NULL) {
+ logview_update_other_components (logview);
+ }
+ gtk_widget_grab_focus (logview->view);
@@ -1304,7 +1303,7 @@
}
/* private functions */
-@@ -334,12 +376,18 @@
+@@ -334,12 +375,18 @@
logview_update_findbar_visibility (LogviewWindow *logview)
{
Log *log = logview->curlog;
@@ -1328,7 +1327,7 @@
gtk_widget_show (logview->find_bar);
else
gtk_widget_hide (logview->find_bar);
-@@ -348,208 +396,284 @@
+@@ -348,208 +395,279 @@
static void
logview_save_prefs (LogviewWindow *logview)
{
@@ -1457,6 +1456,7 @@
+ loglist_add_log (LOG_LIST(logview->loglist), log);
+ g_object_set (G_OBJECT (log), "window", logview, NULL);
+ monitor_start (log);
++ logview_select_log (logview, log);
}
@@ -1531,16 +1531,9 @@
- if (selected == log->current_version)
- return;
-
-- /* select a new version */
+ /* select a new version */
- if (selected == 0) {
- logview_select_log (logview, log->parent_log);
-+/* if (selected == current_version) {
-+ if (selected == 0 && logview->curlog == log)
-+ return;
-+ if (selected > 0 && logview->curlog == old_logs[archive_id])
-+ return;
-+ }
-+*//* select a new version */
+ if (selected >= 0)
+ g_object_set (G_OBJECT (log),
+ "current-version", selected,
@@ -1738,7 +1731,7 @@
if (GTK_WIDGET_VISIBLE (logview->sidebar))
gtk_widget_hide (logview->sidebar);
-@@ -560,7 +684,7 @@
+@@ -560,7 +678,7 @@
static void
logview_toggle_calendar (GtkAction *action, LogviewWindow *logview)
{
@@ -1747,7 +1740,7 @@
if (GTK_WIDGET_VISIBLE (logview->calendar))
gtk_widget_hide (logview->calendar);
-@@ -576,37 +700,46 @@
+@@ -576,37 +694,46 @@
static void
logview_collapse_rows (GtkAction *action, LogviewWindow *logview)
{
@@ -1813,7 +1806,7 @@
}
#define DEFAULT_LOGVIEW_FONT "Monospace 10"
-@@ -635,7 +768,7 @@
+@@ -635,7 +762,7 @@
PangoFontDescription *fontdesc;
PangoContext *context;
@@ -1822,7 +1815,7 @@
context = gtk_widget_get_pango_context (logview->view);
fontdesc = pango_context_get_font_description (context);
-@@ -647,7 +780,7 @@
+@@ -647,7 +774,7 @@
static void
logview_bigger_text (GtkAction *action, LogviewWindow *logview)
{
@@ -1831,7 +1824,7 @@
logview->fontsize = MIN (logview->fontsize + 1, 24);
logview_set_fontsize (logview);
-@@ -656,7 +789,7 @@
+@@ -656,7 +783,7 @@
static void
logview_smaller_text (GtkAction *action, LogviewWindow *logview)
{
@@ -1840,7 +1833,7 @@
logview->fontsize = MAX (logview->fontsize-1, 6);
logview_set_fontsize (logview);
-@@ -665,7 +798,7 @@
+@@ -665,7 +792,7 @@
static void
logview_normal_text (GtkAction *action, LogviewWindow *logview)
{
@@ -1849,7 +1842,7 @@
logview->fontsize = logview->original_fontsize;
logview_set_fontsize (logview);
-@@ -674,47 +807,56 @@
+@@ -674,47 +801,56 @@
static void
logview_search (GtkAction *action, LogviewWindow *logview)
{
@@ -1934,7 +1927,7 @@
}
static void
-@@ -722,7 +864,7 @@
+@@ -722,7 +858,7 @@
{
GtkTreeSelection *selection;
@@ -1943,7 +1936,7 @@
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (logview->view));
gtk_tree_selection_select_all (selection);
-@@ -731,12 +873,12 @@
+@@ -731,12 +867,12 @@
static void
logview_menu_item_toggle_set_active (LogviewWindow *logview, char *path, gboolean state)
{
@@ -1960,7 +1953,7 @@
}
static void
-@@ -753,22 +895,26 @@
+@@ -753,22 +889,26 @@
static void
logview_calendar_set_state (LogviewWindow *logview)
{
@@ -1998,7 +1991,7 @@
if (error) {
error_dialog_show (GTK_WIDGET(parent_window), _("There was an error displaying help."), error->message);
g_error_free (error);
-@@ -777,204 +923,182 @@
+@@ -777,204 +917,182 @@
static gboolean
window_size_changed_cb (GtkWidget *widget, GdkEventConfigure *event,
@@ -2331,7 +2324,7 @@
}
GType
-@@ -1004,21 +1128,28 @@
+@@ -1004,21 +1122,28 @@
GtkWidget *
logview_window_new ()
{
@@ -8373,7 +8366,7 @@
+
Index: gnome-utils/logview/logrtns.c
===================================================================
---- gnome-utils/logview/logrtns.c (revision 7356)
+--- gnome-utils/logview/logrtns.c (revision 7493)
+++ gnome-utils/logview/logrtns.c (working copy)
@@ -1,22 +1,22 @@
-/* ----------------------------------------------------------------------
@@ -8412,7 +8405,7 @@
#ifdef __CYGWIN__
#define timezonevar
-@@ -26,592 +26,1260 @@
+@@ -26,596 +26,1260 @@
#endif
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -9419,7 +9412,11 @@
- i++;
- date_string = string_get_date_string (buffer_lines[i]);
- if (date_string == NULL)
-- continue;
+- if (i==n-1) {
+- done = TRUE;
+- break;
+- } else
+- continue;
- newdate = string_get_date (buffer_lines[i]);
-
- if (newdate == NULL && i==n-1)