Merged 'set_docstatusbar_text' function into 'set_statusbar_text' with a flag.

3 files changed, 11 insertions, 20 deletions

diff --git a/src/lua_interface.c b/src/lua_interface.c
index 7fcf3ee7..9b9163ce 100644
--- a/src/lua_interface.c
+++ b/src/lua_interface.c
@@ -1121,9 +1121,9 @@ LF l_ta_mt_newindex(LS *lua) {
   if (streq(key, "title"))
     gtk_window_set_title(GTK_WINDOW(window), lua_tostring(lua, 3));
   else if (streq(key, "statusbar_text"))
-    set_statusbar_text(lua_tostring(lua, 3));
+    set_statusbar_text(lua_tostring(lua, 3), false);
   else if (streq(key, "docstatusbar_text"))
-    set_docstatusbar_text(lua_tostring(lua, 3));
+    set_statusbar_text(lua_tostring(lua, 3), true);
   else if (streq(key, "focused_doc_pointer") || streq(key, "clipboard_text"))
     luaL_error(lua, "'%s' is read-only.", key);
   else if (streq(key, "menubar")) {
diff --git a/src/textadept.c b/src/textadept.c
index a500a699..82343f43 100644
--- a/src/textadept.c
+++ b/src/textadept.c
@@ -370,22 +370,14 @@ void set_menubar(GtkWidget *new_menubar) {
 /**
  * Sets the notification statusbar text.
  * @param text The text to display.
- */
-void set_statusbar_text(const char *text) {
-  if (!statusbar) return;
-  gtk_statusbar_pop(GTK_STATUSBAR(statusbar), 0);
-  gtk_statusbar_push(GTK_STATUSBAR(statusbar), 0, text);
-}
-
-/**
- * Sets the document status statusbar text.
- * This is typically set via a Scintilla 'UpdateUI' notification.
- * @param text The text to display.
- */
-void set_docstatusbar_text(const char *text) {
-  if (!docstatusbar) return;
-  gtk_statusbar_pop(GTK_STATUSBAR(docstatusbar), 0);
-  gtk_statusbar_push(GTK_STATUSBAR(docstatusbar), 0, text);
+ * @param docbar Flag indicating whether or not the statusbar text is for the
+ *   docstatusbar.
+ */
+void set_statusbar_text(const char *text, bool docbar) {
+  GtkWidget *bar = docbar ? docstatusbar : statusbar;
+  if (!bar) return;
+  gtk_statusbar_pop(GTK_STATUSBAR(bar), 0);
+  gtk_statusbar_push(GTK_STATUSBAR(bar), 0, text);
 }
 
 /**
diff --git a/src/textadept.h b/src/textadept.h
index 52e8a315..581be76f 100644
--- a/src/textadept.h
+++ b/src/textadept.h
@@ -51,8 +51,7 @@ void remove_scintilla_buffer(sptr_t doc);
 void split_window(GtkWidget *editor, bool vertical);
 bool unsplit_window(GtkWidget *editor);
 void set_menubar(GtkWidget *menubar);
-void set_statusbar_text(const char *text);
-void set_docstatusbar_text(const char *text);
+void set_statusbar_text(const char *text, bool docbar);
 void ce_toggle_focus();
 
 GtkWidget *pm_create_ui();