diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-10-27 21:58:44 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-10-27 21:58:44 +0000 |
| commit | 789ca8b0d19be16b1ed7386b9b214cd2b66b0498 (patch) | |
| tree | d774beee921321511040d24ba378a95cc268161e | |
| parent | f15d3511abd9c6dfe489cf2e325d24b77463cefb (diff) | |
Exit if GTK+ can't be initialized.
| -rw-r--r-- | hardinfo2/hardinfo.c | 4 | ||||
| -rw-r--r-- | hardinfo2/util.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hardinfo2/hardinfo.c b/hardinfo2/hardinfo.c index 908c61bf..39b3e481 100644 --- a/hardinfo2/hardinfo.c +++ b/hardinfo2/hardinfo.c @@ -33,6 +33,10 @@ int main(int argc, char **argv) { gui_running = ui_init(&argc, &argv); + + if (!gui_running) { + g_error("Cannot initialize GTK+."); + } if (!binreloc_init(FALSE)) { g_error("Failed to find runtime data.\n\n" diff --git a/hardinfo2/util.c b/hardinfo2/util.c index 5c1412dc..b18283eb 100644 --- a/hardinfo2/util.c +++ b/hardinfo2/util.c @@ -101,16 +101,15 @@ __expand_cb(GtkWidget *widget, gpointer data) { if (GTK_IS_EXPANDER(widget)) { gtk_expander_set_expanded(GTK_EXPANDER(widget), TRUE); - gtk_widget_hide(widget); } else if (GTK_IS_CONTAINER(widget)) { - gtk_container_forall(GTK_CONTAINER(widget), (GtkCallback)__expand_cb, NULL); + gtk_container_foreach(GTK_CONTAINER(widget), (GtkCallback)__expand_cb, NULL); } } void file_chooser_open_expander(GtkWidget *chooser) { - gtk_container_forall(GTK_CONTAINER(chooser), (GtkCallback)__expand_cb, NULL); + gtk_container_foreach(GTK_CONTAINER(chooser), (GtkCallback)__expand_cb, NULL); } void @@ -267,6 +266,7 @@ ui_init(int *argc, char ***argv) g_set_application_name("HardInfo"); g_log_set_handler(NULL, G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | G_LOG_LEVEL_ERROR, log_handler, NULL); + return gtk_init_check(argc, argv); } @@ -275,7 +275,7 @@ open_url(gchar *url) { const gchar *browsers[] = { "xdg-open", "gnome-open", "kfmclient openURL", "sensible-browser", "firefox", "epiphany", "galeon", "mozilla", "opera", "konqueror", - "links -g", NULL}; + "netscape", "links -g", NULL}; gint i; for (i = 0; browsers[i]; i++) { |