From: pcg <pcg>
Date: Wed, 17 Mar 2004 03:47:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e3d9b94391d22954041d8d48f9bfb402b052afc5;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/logging.C b/src/logging.C
index 1e6efa23..f6d19adb 100644
--- a/src/logging.C
+++ b/src/logging.C
@@ -83,7 +83,7 @@ rxvt_term::makeutent (const char *pty, const char *hostname)
 #endif
   else if (STRNCMP (pty, "pty", 3) && STRNCMP (pty, "tty", 3))
     {
-      rxvt_print_error ("can't parse tty name \"%s\"", pty);
+      rxvt_warn ("can't parse tty name \"%s\", not adding utmp entry.\n", pty);
       return;
     }
 
@@ -405,9 +405,10 @@ rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
   pwent = getpwuid (getuid ());
   if (!pwent)
     {
-      rxvt_print_error ("no entry in password file");
+      rxvt_warn ("no entry in password file, not updating lastlog.\n");
       return;
     }
+
   MEMSET (&ll, 0, sizeof (ll));
   ll.ll_time = time (NULL);
   STRNCPY (ll.ll_line, pty, sizeof (ll.ll_line));
diff --git a/src/menubar.C b/src/menubar.C
index 75c95811..f7f42d36 100644
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -1848,7 +1848,7 @@ rxvt_term::menubar_dispatch (char *str)
                 if (name == NULL || str == NULL || str <= (name + 1)
                     || (name > path && name[-1] != '/'))
                   {
-                    rxvt_print_error ("menu error <%s>\n", path);
+                    rxvt_warn ("menu error A<%s>, continuing.\n", path);
                     break;
                   }
                 if (str[1] == MENUITEM_BEG)
@@ -1858,7 +1858,7 @@ rxvt_term::menubar_dispatch (char *str)
 
                     if (str == NULL)
                       {
-                        rxvt_print_error ("menu error <%s>\n", path);
+                        rxvt_warn ("menu error B<%s>, continuing.\n", path);
                         break;
                       }
                     name2[-2] = '\0';	/* remove prev MENUITEM_END */
diff --git a/src/scrollbar-xterm.C b/src/scrollbar-xterm.C
index 9c490ce9..150a80bb 100644
--- a/src/scrollbar-xterm.C
+++ b/src/scrollbar-xterm.C
@@ -46,10 +46,8 @@ rxvt_term::scrollbar_show_xterm (int update __attribute__ ((unused)), int last_t
                                               (char *)x_stp_bits, x_stp_width,
                                               x_stp_height);
       if (!gcvalue.stipple)
-        {
-          rxvt_print_error ("can't create bitmap");
-          exit (EXIT_FAILURE);
-        }
+        rxvt_fatal ("can't create bitmap");
+
       gcvalue.fill_style = FillOpaqueStippled;
       gcvalue.foreground = PixColors[Color_fg];
       gcvalue.background = PixColors[Color_bg];
diff --git a/src/xpm.C b/src/xpm.C
index 5f2f436e..3f2ab8d3 100644
--- a/src/xpm.C
+++ b/src/xpm.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	xpm.c
  *----------------------------------------------------------------------*
- * $Id: xpm.C,v 1.9 2004-02-13 12:16:21 pcg Exp $
+ * $Id: xpm.C,v 1.10 2004-03-17 03:47:14 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1997      Carsten Haitzler <raster@zip.com.au>
@@ -377,17 +377,18 @@ rxvt_term::set_bgPixmap (const char *file)
                                  &bgPixmap.pixmap, NULL,
                                  &xpmAttr))
         {
-          char           *p;
+          char *p;
 
           /* semi-colon delimited */
           if ((p = STRCHR (file, ';')) == NULL)
             p = STRCHR (file, '\0');
 
-          rxvt_print_error ("couldn't load XPM file \"%.*s\"", (p - file),
-                           file);
+          rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.", (p - file), file);
         }
+
       free (f);
     }
+
   resize_pixmap ();
   return bgPixmap.pixmap;
 }