diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-09-16 14:52:49 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2011-01-24 14:19:21 -0500 |
| commit | 5d5714f01e1a7140847f6e7f2922d457f6bbe66a (patch) | |
| tree | 064f8493aff3db02a7c41f2d29364c7e9b3b66f9 /openbox/openbox.c | |
| parent | d3d96b572a9278cf8f3542b56e583b1744b1110f (diff) | |
Handle STRING and COMPOUND_TEXT type text properties.
STRING should be latin1 text (plus TAB and LF)
COMPOUND_TEXT should be encoded in the current locale.
Diffstat (limited to 'openbox/openbox.c')
| -rw-r--r-- | openbox/openbox.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index ae0ba8ae..9fd5fe40 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -258,8 +258,7 @@ gint main(gint argc, gchar **argv) gchar *p = g_filename_to_utf8(config_file, -1, NULL, NULL, NULL); if (p) - OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, - utf8, p); + OBT_PROP_SETS(obt_root(ob_screen), OB_CONFIG_FILE, p); g_free(p); } else @@ -286,8 +285,8 @@ gint main(gint argc, gchar **argv) if (ob_rr_theme == NULL) ob_exit_with_error(_("Unable to load a theme.")); - OBT_PROP_SETS(obt_root(ob_screen), - OB_THEME, utf8, ob_rr_theme->name); + OBT_PROP_SETS(obt_root(ob_screen), OB_THEME, + ob_rr_theme->name); } if (reconfigure) { |