diff options
| author | Josh Rickmar <jrick@devio.us> | 2012-07-11 17:25:37 -0400 |
|---|---|---|
| committer | Josh Rickmar <jrick@devio.us> | 2012-07-11 17:25:37 -0400 |
| commit | c8253a4a18191568316544eba605e997f08507cb (patch) | |
| tree | 6eccda0f7be393c223916fdca8e2ae16a2f1d5dc | |
| parent | 958f63e109c4ad9bd395f1c22b4cf0acb7f97b7d (diff) | |
| download | xombrero-c8253a4a18191568316544eba605e997f08507cb.tar.gz | |
Instead of erroring out when unable to set special settings, add a
warning to about:startpage. While in here, clean up some #ifdefs.
| -rw-r--r-- | settings.c | 3 | ||||
| -rw-r--r-- | xombrero.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/settings.c b/settings.c index 65acd9e..31923b8 100644 --- a/settings.c +++ b/settings.c @@ -2572,7 +2572,8 @@ settings_add(char *var, char *val) if (rs[i].s) { if (rs[i].s->set(&rs[i], val)) - errx(1, "invalid value for %s: %s", var, val); + startpage_add("invalid value for %s: %s", var, + val); rv = 1; break; } else diff --git a/xombrero.c b/xombrero.c index 0f8ea5a..6ec5149 100644 --- a/xombrero.c +++ b/xombrero.c @@ -6877,8 +6877,7 @@ create_browser(struct tab *t) GTK_SCROLLED_WINDOW(w)); t->adjust_v = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(w)); -#if GTK_CHECK_VERSION(3, 0, 0) -#else +#if !GTK_CHECK_VERSION(3, 0, 0) gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); #endif |