Merge branch 'master' into plugins

Conflicts:
	src/ui/core.c

src/command/command.c

@@ -55,7 +55,6 @@ static void _cmd_complete_parameters(char *input, int *size);
 
 static char * _sub_autocomplete(char *input, int *size);
 static char * _notify_autocomplete(char *input, int *size);
-static char * _titlebar_autocomplete(char *input, int *size);
 static char * _theme_autocomplete(char *input, int *size);
 static char * _autoaway_autocomplete(char *input, int *size);
 static char * _autoconnect_autocomplete(char *input, int *size);
@@ -527,12 +526,11 @@ static struct cmd_t command_defs[] =
           NULL  } } },
 
     { "/titlebar",
-        cmd_titlebar, parse_args, 2, 2, &cons_titlebar_setting,
+        cmd_titlebar, parse_args, 1, 1, &cons_titlebar_setting,
-        { "/titlebar property on|off", "Show various properties in the window title bar.",
+        { "/titlebar on|off", "Show information in the window title bar.",
-        { "/titlebar property on|off",
+        { "/titlebar on|off",
-          "-------------------------",
+          "----------------",
-          "Show various properties in the window title bar.",
+          "Show information in the window title bar.",
-          "Currently The only supported property is 'version'.",
           NULL  } } },
 
     { "/mouse",
@@ -1438,7 +1436,7 @@ _cmd_complete_parameters(char *input, int *size)
 
     // autocomplete boolean settings
     gchar *boolean_choices[] = { "/beep", "/intype", "/states", "/outtype",
-        "/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history",
+        "/flash", "/splash", "/chlog", "/grlog", "/mouse", "/history", "/titlebar",
         "/vercheck" };
 
     for (i = 0; i < ARRAY_SIZE(boolean_choices); i++) {
@@ -1525,7 +1523,7 @@ _cmd_complete_parameters(char *input, int *size)
     }
 
     autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete,
-        _autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete,
+        _autoaway_autocomplete, _theme_autocomplete,
         _account_autocomplete, _roster_autocomplete, _group_autocomplete,
         _bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete,
         _connect_autocomplete, _statuses_autocomplete, _alias_autocomplete,
@@ -1652,23 +1650,6 @@ _notify_autocomplete(char *input, int *size)
     return NULL;
 }
 
-static char *
-_titlebar_autocomplete(char *input, int *size)
-{
-    char *result = NULL;
-    result = autocomplete_param_with_func(input, size, "/titlebar version",
-        prefs_autocomplete_boolean_choice);
-    if (result != NULL) {
-        return result;
-    }
-    result = autocomplete_param_with_ac(input, size, "/titlebar", titlebar_ac);
-    if (result != NULL) {
-        return result;
-    }
-
-    return NULL;
-}
-
 static char *
 _autoaway_autocomplete(char *input, int *size)
 {

src/command/commands.c

@@ -2165,13 +2165,10 @@ cmd_states(gchar **args, struct cmd_help_t help)
 gboolean
 cmd_titlebar(gchar **args, struct cmd_help_t help)
 {
-    if (strcmp(args[0], "version") != 0) {
+    if (g_strcmp0(args[0], "off") == 0) {
-        cons_show("Usage: %s", help.usage);
+        ui_clear_win_title();
-        return TRUE;
-    } else {
-        return _cmd_set_boolean_preference(args[1], help,
-        "Show version in window title", PREF_TITLEBARVERSION);
     }
+    return _cmd_set_boolean_preference(args[0], help, "Titlebar", PREF_TITLEBAR);
 }
 
 gboolean

src/config/preferences.c

@@ -384,7 +384,7 @@ _get_group(preference_t pref)
         case PREF_BEEP:
         case PREF_THEME:
         case PREF_VERCHECK:
-        case PREF_TITLEBARVERSION:
+        case PREF_TITLEBAR:
         case PREF_FLASH:
         case PREF_INTYPE:
         case PREF_HISTORY:
@@ -431,8 +431,8 @@ _get_key(preference_t pref)
             return "theme";
         case PREF_VERCHECK:
             return "vercheck";
-        case PREF_TITLEBARVERSION:
+        case PREF_TITLEBAR:
-            return "titlebar.version";
+            return "titlebar";
         case PREF_FLASH:
             return "flash";
         case PREF_INTYPE:
@@ -487,9 +487,10 @@ _get_default_boolean(preference_t pref)
 {
     switch (pref)
     {
-        case PREF_STATUSES:
+        case PREF_TITLEBAR:
-        case PREF_AUTOAWAY_CHECK:
         case PREF_OTR_WARN:
+        case PREF_AUTOAWAY_CHECK:
+            return TRUE;
         default:
             return FALSE;
     }

src/config/preferences.h

@@ -40,7 +40,7 @@ typedef enum {
     PREF_BEEP,
     PREF_VERCHECK,
     PREF_THEME,
-    PREF_TITLEBARVERSION,
+    PREF_TITLEBAR,
     PREF_FLASH,
     PREF_INTYPE,
     PREF_HISTORY,

src/profanity.c

@@ -318,6 +318,7 @@ _init(const int disable_tls, char *log_level)
 static void
 _shutdown(void)
 {
+    ui_clear_win_title();
     ui_close_all_wins();
     jabber_disconnect();
     jabber_shutdown();

src/ui/console.c

@@ -1002,10 +1002,10 @@ _cons_statuses_setting(void)
 static void
 _cons_titlebar_setting(void)
 {
-    if (prefs_get_boolean(PREF_TITLEBARVERSION)) {
+    if (prefs_get_boolean(PREF_TITLEBAR)) {
-        cons_show("Titlebar display (/titlebar)  : version");
+        cons_show("Titlebar display (/titlebar)  : ON");
     } else {
-        cons_show("Titlebar display (/titlebar)  : NONE");
+        cons_show("Titlebar display (/titlebar)  : OFF");
     }
 }
 

src/ui/core.c

@@ -101,7 +101,9 @@ _ui_init(void)
 static void
 _ui_update_screen(void)
 {
-    _ui_draw_win_title();
+    if (prefs_get_boolean(PREF_TITLEBAR)) {
+        _ui_draw_win_title();
+    }
     title_bar_update_virtual();
     status_bar_update_virtual();
     inp_put_back();
@@ -1502,28 +1504,16 @@ _ui_chat_win_contact_offline(PContact contact, char *resource, char *status)
     free(display_str);
 }
 
+static void
+_ui_clear_win_title(void)
+{
+    printf("%c]0;%c", '\033', '\007');
+}
+
 static void
 _ui_draw_win_title(void)
 {
     char new_win_title[100];
-
-    GString *version_str = g_string_new("");
-
-    if (prefs_get_boolean(PREF_TITLEBARVERSION)) {
-        g_string_append(version_str, " ");
-        g_string_append(version_str, PROF_PACKAGE_VERSION);
-        if (strcmp(PROF_PACKAGE_STATUS, "development") == 0) {
-#ifdef PROF_HAVE_GIT_VERSION
-            g_string_append(version_str, "dev.");
-            g_string_append(version_str, PROF_GIT_BRANCH);
-            g_string_append(version_str, ".");
-            g_string_append(version_str, PROF_GIT_REVISION);
-#else
-            g_string_append(version_str, "dev");
-#endif
-        }
-    }
-
     jabber_conn_status_t status = jabber_get_connection_status();
 
     if (status == JABBER_CONNECTED) {
@@ -1532,20 +1522,18 @@ _ui_draw_win_title(void)
 
         if (unread != 0) {
             snprintf(new_win_title, sizeof(new_win_title),
-                "%c]0;%s%s (%d) - %s%c", '\033', "Profanity", version_str->str,
+                "%c]0;%s (%d) - %s%c", '\033', "Profanity",
                 unread, jid, '\007');
         } else {
             snprintf(new_win_title, sizeof(new_win_title),
-                "%c]0;%s%s - %s%c", '\033', "Profanity", version_str->str, jid,
+                "%c]0;%s - %s%c", '\033', "Profanity", jid,
                 '\007');
         }
     } else {
-        snprintf(new_win_title, sizeof(new_win_title), "%c]0;%s%s%c", '\033',
+        snprintf(new_win_title, sizeof(new_win_title), "%c]0;%s%c", '\033',
-            "Profanity", version_str->str, '\007');
+            "Profanity", '\007');
     }
 
-    g_string_free(version_str, TRUE);
-
     if (g_strcmp0(win_title, new_win_title) != 0) {
         // print to x-window title bar
         printf("%s", new_win_title);
@@ -1782,4 +1770,5 @@ ui_init_module(void)
     ui_handle_recipient_error = _ui_handle_recipient_error;
     ui_handle_error = _ui_handle_error;
     ui_current_update_virtual = _ui_current_update_virtual;
+    ui_clear_win_title = _ui_clear_win_title;
 }

src/ui/ui.h

@@ -132,6 +132,7 @@ void (*ui_chat_win_contact_offline)(PContact contact, char *resource, char *stat
 void (*ui_handle_recipient_not_found)(const char * const recipient, const char * const err_msg);
 void (*ui_handle_recipient_error)(const char * const recipient, const char * const err_msg);
 void (*ui_handle_error)(const char * const err_msg);
+void (*ui_clear_win_title)(void);
 
 // contact status functions
 void (*ui_status_room)(const char * const contact);