gnome-utils r8228 - trunk/logview

[cosimoc svn gnome org]

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

Log:
Make at least the LogviewManager build.

Modified:
   trunk/logview/Makefile.am
   trunk/logview/loglist.h
   trunk/logview/logview-manager.c
   trunk/logview/logview-manager.h
   trunk/logview/logview.c
   trunk/logview/logview.h

Modified: trunk/logview/Makefile.am
==============================================================================
--- trunk/logview/Makefile.am	(original)
+++ trunk/logview/Makefile.am	Tue Dec 23 13:25:27 2008
@@ -19,8 +19,9 @@
 
 gnome_system_log_SOURCES = 	\
 	logview-main.c		\
-	about.c			\
-	about.h			\
+	logview-about.h		\
+	logview-manager.c	\
+	logview-manager.h	\
 	calendar.c		\
 	calendar.h		\
 	log_repaint.c		\
@@ -29,17 +30,15 @@
 	logrtns.h		\
 	logview.c		\
 	logview.h		\
-	logview-log.h \
-	logview-log.c \
+	logview-log.h		\
+	logview-log.c		\
 	misc.c			\
 	misc.h			\
-	monitor.c       	\
-	monitor.h		\
-	logview-prefs.c         \
-	logview-prefs.h         \
+	logview-prefs.c		\
+	logview-prefs.h		\
 	logview-findbar.c	\
-	logview-findbar.h   \
-	loglist.c       \
+	logview-findbar.h	\
+	loglist.c		\
 	loglist.h
 
 gnome_system_log_LDADD = \

Modified: trunk/logview/loglist.h
==============================================================================
--- trunk/logview/loglist.h	(original)
+++ trunk/logview/loglist.h	Tue Dec 23 13:25:27 2008
@@ -28,6 +28,7 @@
 #define LOG_LIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), LOG_LIST_TYPE, LogListClass))
 
 #include <gtk/gtk.h>
+#include "logview.h"
 
 typedef struct LogListPriv LogListPriv;
 typedef struct LogList

Modified: trunk/logview/logview-manager.c
==============================================================================
--- trunk/logview/logview-manager.c	(original)
+++ trunk/logview/logview-manager.c	Tue Dec 23 13:25:27 2008
@@ -24,6 +24,7 @@
 
 enum {
   LOG_ADDED,
+  LOG_CLOSED,
   LOG_ADD_ERROR,
   ACTIVE_CHANGED,
   LAST_SIGNAL
@@ -113,7 +114,7 @@
 static void
 logview_manager_init (LogviewManager *self)
 {
-  self->priv = GET_PRIVATE (self);
+  LogviewManagerPrivate *priv = self->priv = GET_PRIVATE (self);
 
   priv->active_log = NULL;
   priv->logs = g_hash_table_new_full (g_str_hash, g_str_equal, 
@@ -186,7 +187,7 @@
   g_signal_emit (manager, signals[ACTIVE_CHANGED], 0, log, NULL);
 }
 
-void
+LogviewLog *
 logview_manager_get_active_log (LogviewManager *manager)
 {
   g_assert (LOGVIEW_IS_MANAGER (manager));
@@ -206,7 +207,8 @@
   g_assert (LOGVIEW_IS_MANAGER (manager));
 
   for (l = names; l; l = l->next) {
-    logview_manager_add_log_from_name (l->data, (g_ascii_strcasecmp (active, l->data) == 0));
+    logview_manager_add_log_from_name (manager, l->data,
+                                       (g_ascii_strcasecmp (active, l->data) == 0));
   }
 }
 
@@ -224,7 +226,7 @@
     set_active = (manager->priv->logs == NULL);
   }
 
-  if (log = g_hash_table_lookup (manager->priv->logs, filename) != NULL) {
+  if ((log = g_hash_table_lookup (manager->priv->logs, filename)) != NULL) {
     /* log already exists, don't load it */
     if (set_active) {
       logview_manager_set_active_log (manager, log);

Modified: trunk/logview/logview-manager.h
==============================================================================
--- trunk/logview/logview-manager.h	(original)
+++ trunk/logview/logview-manager.h	Tue Dec 23 13:25:27 2008
@@ -25,6 +25,8 @@
 
 #include <glib-object.h>
 
+#include "logview-log.h"
+
 G_BEGIN_DECLS
 
 #define LOGVIEW_TYPE_MANAGER logview_manager_get_type()
@@ -66,9 +68,11 @@
 /* public methods */
 LogviewManager* logview_manager_get                 (void);
 void            logview_manager_add_log_from_name   (LogviewManager *manager,
-                                                     const char *filename);
+                                                     const char *filename,
+                                                     gboolean set_active);
 void            logview_manager_add_logs_from_names (LogviewManager *manager,
-                                                     GSList *names);
+                                                     GSList *names,
+                                                     const char *active);
 void            logview_manager_set_active_log      (LogviewManager *manager,
                                                      LogviewLog *log);
 LogviewLog *    logview_manager_get_active_log      (LogviewManager *manager);

Modified: trunk/logview/logview.c
==============================================================================
--- trunk/logview/logview.c	(original)
+++ trunk/logview/logview.c	Tue Dec 23 13:25:27 2008
@@ -28,12 +28,13 @@
 #include "loglist.h"
 #include "log_repaint.h"
 #include "logrtns.h"
-#include "about.h"
 #include "misc.h"
 #include "logview-findbar.h"
+#include "calendar.h"
+
+#include "logview-about.h"
 #include "logview-prefs.h"
 #include "logview-manager.h"
-#include "calendar.h"
 
 #define APP_NAME _("System Log Viewer")
 
@@ -804,10 +805,6 @@
                     G_CALLBACK (font_changed_cb), logview);
   g_signal_connect (priv->prefs, "have-tearoff-changed",
                     G_CALLBACK (tearoff_changed_cb), logview);
-  g_signal_connect (priv->manager, "log-added",
-                    G_CALLBACK (log_added_cb), logview);
-  g_signal_connect (priv->manager, "active-changed",
-                    G_CALLBACK (active_log_changed_cb), logview);
 
   /* Status area at bottom */
   priv->statusbar = gtk_statusbar_new ();

Modified: trunk/logview/logview.h
==============================================================================
--- trunk/logview/logview.h	(original)
+++ trunk/logview/logview.h	Tue Dec 23 13:25:27 2008
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 
 #include "logrtns.h"
-#include "loglist.h"
 
 #define MAX_VERSIONS             5
 
@@ -54,7 +53,6 @@
 GtkWidget *logview_window_new (void);
 
 Log *logview_get_active_log (LogviewWindow *logview);
-LogList *logview_get_loglist (LogviewWindow *logview);
 int logview_count_logs (LogviewWindow *logview);
 void logview_select_log (LogviewWindow *logview, Log *log);
 void logview_add_log_from_name (LogviewWindow *logview, gchar *file);