From 52a6fc08309c7eb615de81cc91d5d7a7bffb66f4 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 31 Jul 2003 16:56:35 +0000 Subject: [PATCH] expose exit_with_error --- openbox/openbox.c | 10 ++++------ openbox/openbox.h | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openbox/openbox.c b/openbox/openbox.c index b5fde858..59e126b7 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -67,8 +67,6 @@ static gchar *sm_save_file; static void signal_handler(const ObEvent *e, void *data); static void parse_args(int argc, char **argv); -static void exit_with_error(gchar *msg); - int main(int argc, char **argv) { struct sigaction action; @@ -132,7 +130,7 @@ int main(int argc, char **argv) if (ob_display == NULL) exit_with_error("Failed to open the display."); if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) - exit_with_error("Failed to set display as close-on-exec."); + ob_exit_with_error("Failed to set display as close-on-exec."); if (sm_save_file) session_load(sm_save_file); @@ -146,7 +144,7 @@ int main(int argc, char **argv) ob_rr_inst = RrInstanceNew(ob_display, ob_screen); if (ob_rr_inst == NULL) - exit_with_error("Failed to initialize the render library."); + ob_exit_with_error("Failed to initialize the render library."); /* XXX fork self onto other screens */ @@ -238,7 +236,7 @@ int main(int argc, char **argv) /* load the theme specified in the rc file */ ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme); if (ob_rr_theme == NULL) - exit_with_error("Unable to load a theme."); + ob_exit_with_error("Unable to load a theme."); moveresize_startup(); screen_startup(); @@ -404,7 +402,7 @@ static void parse_args(int argc, char **argv) } } -static void exit_with_error(gchar *msg) +void ob_exit_with_error(gchar *msg) { g_critical(msg); session_shutdown(); diff --git a/openbox/openbox.h b/openbox/openbox.h index 5ed4c11e..b5b473b8 100644 --- a/openbox/openbox.h +++ b/openbox/openbox.h @@ -38,6 +38,8 @@ void ob_restart_other(const gchar *path); void ob_restart(); void ob_exit(); +void ob_exit_with_error(gchar *msg); + Cursor ob_cursor(ObCursor cursor); KeyCode ob_keycode(ObKey key); -- 2.39.2