gnome-utils r8250 - trunk/logview

[cosimoc svn gnome org]

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

Log:
Misc bugfixing leading to crashers.

Modified:
   trunk/logview/logview-loglist.c
   trunk/logview/logview.c

Modified: trunk/logview/logview-loglist.c
==============================================================================
--- trunk/logview/logview-loglist.c	(original)
+++ trunk/logview/logview-loglist.c	Tue Dec 23 13:26:08 2008
@@ -164,7 +164,7 @@
   }
 
   gtk_tree_model_get (model, &iter, LOG_OBJECT, &log,
-                      LOG_WEIGHT_SET, &is_bold);
+                      LOG_WEIGHT_SET, &is_bold, -1);
   logview_manager_set_active_log (list->priv->manager, log);
 
   if (is_bold) {
@@ -214,7 +214,7 @@
                                        "weight", LOG_WEIGHT,
                                        NULL);
 
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list->priv->model), 0, GTK_SORT_ASCENDING);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list->priv->model), LOG_NAME, GTK_SORT_ASCENDING);
   gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
   gtk_tree_view_set_search_column (GTK_TREE_VIEW (list), -1);
 

Modified: trunk/logview/logview.c
==============================================================================
--- trunk/logview/logview.c	(original)
+++ trunk/logview/logview.c	Tue Dec 23 13:26:08 2008
@@ -95,7 +95,6 @@
 	"			<menuitem action='ShowCalendar'/>"
 	"			<separator/>"
 	"			<menuitem action='Search'/>"
-	"			<menuitem action='CollapseAll'/>"
 	"			<separator/>"
 	"			<menuitem action='ViewZoomIn'/>"
 	"			<menuitem action='ViewZoomOut'/>"
@@ -308,7 +307,6 @@
 
   logview_menu_item_set_state (logview, "/LogviewMenu/ViewMenu/ShowCalendar", calendar_active);
   logview_menu_item_set_state (logview, "/LogviewMenu/FileMenu/CloseLog", (log != NULL));
-  logview_menu_item_set_state (logview, "/LogviewMenu/ViewMenu/CollapseAll", calendar_active);
   logview_menu_item_set_state (logview, "/LogviewMenu/ViewMenu/Search", (log != NULL));
   logview_menu_item_set_state (logview, "/LogviewMenu/EditMenu/Copy", (log != NULL));
   logview_menu_item_set_state (logview, "/LogviewMenu/EditMenu/SelectAll", (log != NULL));
@@ -652,7 +650,6 @@
 
   if (lines != NULL) {
     int i;
-    GtkTextBuffer *buffer;
     GtkTextIter iter;
 
     /* update the text view to show the current lines */
@@ -797,7 +794,7 @@
   priv->tag_table = gtk_text_tag_table_new ();
   populate_tag_table (priv->tag_table);
   priv->text_view = gtk_text_view_new ();
-  gtk_box_pack_end (GTK_BOX (main_view), priv->text_view, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (main_view), priv->text_view, TRUE, TRUE, 0);
   gtk_widget_show (priv->text_view);
 
   /* use the desktop monospace font */