Remove obsolete User class

naxuroqa · Feb 19, 2018 · cb3d527 · cb3d527
1 parent f3c58e6
commit cb3d527
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 54 deletions.
diff --git a/src/core/Message.vala b/src/core/Message.vala
@@ -72,7 +72,7 @@ namespace Venom {
 
     public virtual string get_sender_plain() {
       if (from == null) {
-        return User.instance.name;
+        return _("me");
       } else {
         return from.get_name_string();
       }

diff --git a/src/core/User.vala b/src/core/User.vala
diff --git a/src/meson.build b/src/meson.build
@@ -34,7 +34,6 @@ venom_source = files(
 			'core/R.vala',
 			'core/Tools.vala',
 			'core/WidgetFactory.vala',
-			'core/User.vala',
 			'core/UserInfo.vala',
 			'db/DatabaseInterfaces.vala',
 			'db/SqliteSettingsDatabase.vala',

diff --git a/src/tox/GroupMessage.vala b/src/tox/GroupMessage.vala
@@ -55,7 +55,7 @@ namespace Venom {
 
     public virtual string get_sender_plain() {
       if (message_direction == MessageDirection.OUTGOING) {
-        return User.instance.name;
+        return _("me");
       } else {
         return sender_name;
       }

diff --git a/src/ui/ConferenceWindow.vala b/src/ui/ConferenceWindow.vala
@@ -62,9 +62,7 @@ namespace Venom {
       text_view.key_press_event.connect(on_keypress);
       app_window.add_action_entries(win_entries, this);
 
-      // trigger autoscroll
-      on_items_changed(0, 0, 1);
-
+      delayed_scroll_to_end();
       model.items_changed.connect(on_items_changed);
 
       logger.d("ConferenceWindow created.");
@@ -86,10 +84,14 @@ namespace Venom {
 
     private void on_items_changed(uint pos, uint rem, uint add) {
       if (add - rem > 0) {
-        GLib.Timeout.add(50, scroll_to_end);
+        delayed_scroll_to_end();
       }
     }
 
+    private void delayed_scroll_to_end() {
+      GLib.Timeout.add(50, scroll_to_end);
+    }
+
     private bool scroll_to_end() {
       var adjustment = scrolled_window.vadjustment;
       adjustment.value = adjustment.upper - adjustment.page_size;

diff --git a/src/ui/ConversationWindow.vala b/src/ui/ConversationWindow.vala
@@ -68,9 +68,7 @@ namespace Venom {
       text_view.buffer.changed.connect(on_buffer_changed);
       app_window.add_action_entries(win_entries, this);
 
-      // trigger autoscroll
-      on_items_changed(0, 0, 1);
-
+      delayed_scroll_to_end();
       model.items_changed.connect(on_items_changed);
 
       logger.d("ConversationWindow created.");
@@ -86,10 +84,14 @@ namespace Venom {
 
     private void on_items_changed(uint pos, uint rem, uint add) {
       if (add - rem > 0) {
-        GLib.Timeout.add(50, scroll_to_end);
+        delayed_scroll_to_end();
       }
     }
 
+    private void delayed_scroll_to_end() {
+      GLib.Timeout.add(50, scroll_to_end);
+    }
+
     private bool scroll_to_end() {
       var adjustment = scrolled_window.vadjustment;
       adjustment.value = adjustment.upper - adjustment.page_size;