rename the openbox_* atoms back to ob_*

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 18d9884d8f0dcc831a1dfab869cefc8e2bc6037e..2de1f7e7709bdd2558628a7d603fedb8b065ca89 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -139,9 +139,9 @@ gint main(gint argc, gchar **argv)
 
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL)
-        ob_exit_with_error("Failed to open the display.");
+        ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
     if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
-        ob_exit_with_error("Failed to set display as close-on-exec.");
+        ob_exit_with_error("Failed to set display as close-on-exec");
 
     if (remote_control) {
         prop_startup();
@@ -150,7 +150,7 @@ gint main(gint argc, gchar **argv)
          * remote_control = 1 -> reconfigure 
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
-                 openbox_control, remote_control, 0, 0, 0);
+                 ob_control, remote_control, 0, 0, 0);
         XCloseDisplay(ob_display);
         exit(EXIT_SUCCESS);
     }
@@ -170,7 +170,7 @@ gint main(gint argc, gchar **argv)
 
     ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
     if (ob_rr_inst == NULL)
-        ob_exit_with_error("Failed to initialize the render library.");
+        ob_exit_with_error(_("Failed to initialize the render library."));
 
     XSynchronize(ob_display, xsync);
 
@@ -242,7 +242,7 @@ gint main(gint argc, gchar **argv)
 
                 if (config_type != NULL)
                     PROP_SETS(RootWindow(ob_display, ob_screen),
-                              openbox_config, config_type);
+                              ob_config, config_type);
 
                 /* we're done with parsing now, kill it */
                 parse_shutdown(i);
@@ -262,7 +262,7 @@ gint main(gint argc, gchar **argv)
                     ob_rr_theme = theme;
                 }
                 if (ob_rr_theme == NULL)
-                    ob_exit_with_error("Unable to load a theme.");
+                    ob_exit_with_error(_("Unable to load a theme."));
             }
 
             if (reconfigure) {
@@ -457,13 +457,11 @@ static void print_help()
 {
     g_print(_("Syntax: openbox [options]\n"));
     g_print(_("\nOptions:\n"));
-    g_print(_("  --config TYPE       Specify the configuration profile to use\n"));
-#ifdef USE_SM
-    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
-#endif
-    g_print(_("  --replace           Replace the currently running window manager\n"));
     g_print(_("  --help              Display this help and exit\n"));
     g_print(_("  --version           Display the version and exit\n"));
+    g_print(_("  --replace           Replace the currently running window manager\n"));
+    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
+    g_print(_("  --config TYPE       Specify the configuration profile to use\n"));
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
     g_print(_("\nDebugging options:\n"));
@@ -534,7 +532,6 @@ static void parse_args(gint *argc, gchar **argv)
                 ++i;
             }
         }
-#ifdef USE_SM
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */
                 /* not translated cuz it's sekret */
@@ -561,11 +558,10 @@ static void parse_args(gint *argc, gchar **argv)
         else if (!strcmp(argv[i], "--sm-disable")) {
             ob_sm_use = FALSE;
         }
-#endif
         else {
             /* this is a memleak.. oh well.. heh */
             gchar *err = g_strdup_printf
-                ("Invalid command line argument '%s'\n", argv[i]);
+                (_("Invalid command line argument '%s'\n"), argv[i]);
             ob_exit_with_error(err);
         }
     }
@@ -585,7 +581,7 @@ static Cursor load_cursor(const gchar *name, guint fontval)
 
 void ob_exit_with_error(const gchar *msg)
 {
-    g_critical(msg);
+    g_message(msg);
     session_shutdown(TRUE);
     exit(EXIT_FAILURE);
 }