aboutsummaryrefslogtreecommitdiff
path: root/deskutils/gnomeutils2/files/patch-logview_logview.c
blob: 942ed8a02d6bf6bb8de781ca3da932c44f675989 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
--- logview/logview.c.orig	Fri May  7 21:47:59 2004
+++ logview/logview.c	Wed Aug  4 18:40:24 2004
@@ -781,7 +781,7 @@
 
 	if ( ! found) {
 		g_snprintf (full_name, sizeof (full_name),
-			    "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX);
+			    "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR);
 		if (access (full_name, R_OK) == 0) {
 			found = TRUE;
 			g_free (cfg->regexp_db_path);
@@ -804,7 +804,7 @@
 
 	if ( ! found) {
 		g_snprintf (full_name, sizeof (full_name),
-			    "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX);
+			    "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR);
 		if (access (full_name, R_OK) == 0) {
 			found = TRUE;
 			g_free (cfg->descript_db_path);
@@ -838,7 +838,7 @@
 
 	if ( ! found) {
 		g_snprintf (full_name, sizeof (full_name),
-			    "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX);
+			    "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR);
 		if (access (full_name, R_OK) == 0) {
 			found = TRUE;
 			g_free (cfg->action_db_path);
@@ -922,6 +922,7 @@
             /* remove trailing newline */
             if (logfile[strlen(logfile)-1] == '\n')
                 logfile[strlen(logfile)-1] = '\0';
+	    if (strcmp (logfile, "/dev/console") == 0) continue;
             fprintf(stderr, "Found a logfile: (%s)\n", logfile);
             return logfile;
         }