From c8bdb32e86ab119434b8319fd679ef15900bb43c Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Mon, 11 Jul 2016 17:52:03 +0300
Subject: [PATCH] rebase

---
 src/images/group.png            | Bin 4142 -> 0 bytes
 {src => toxygen}/basecontact.py |   0
 toxygen/contact.py              |   3 +++
 {src => toxygen}/groupchat.py   |   0
 toxygen/profile.py              |  29 +++++++++++++----------------
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100755 src/images/group.png
 rename {src => toxygen}/basecontact.py (100%)
 rename {src => toxygen}/groupchat.py (100%)

diff --git a/src/images/group.png b/src/images/group.png
deleted file mode 100755
index 22adab0a66b1b939ae0c9b6fee5d0781c41b91c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4142
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

diff --git a/src/basecontact.py b/toxygen/basecontact.py
similarity index 100%
rename from src/basecontact.py
rename to toxygen/basecontact.py
diff --git a/toxygen/contact.py b/toxygen/contact.py
index 6fc90ed..0743e70 100644
--- a/toxygen/contact.py
+++ b/toxygen/contact.py
@@ -5,6 +5,9 @@ except ImportError:
 import basecontact
 from messages import *
 from history import *
+from settings import ProfileHelper
+from toxcore_enums_and_consts import *
+from util import curr_directory
 
 
 class Contact(basecontact.BaseContact):
diff --git a/src/groupchat.py b/toxygen/groupchat.py
similarity index 100%
rename from src/groupchat.py
rename to toxygen/groupchat.py
diff --git a/toxygen/profile.py b/toxygen/profile.py
index cf527d3..fae590f 100644
--- a/toxygen/profile.py
+++ b/toxygen/profile.py
@@ -180,9 +180,6 @@ class Profile(basecontact.BaseContact, Singleton):
                 friend_or_gc.delete_old_messages()
                 self._screen.messageEdit.setPlainText(friend_or_gc.curr_text)
                 self._messages.clear()
-                friend.load_corr()
-                messages = friend.get_corr()[-PAGE_SIZE:]
-                self._load_history = False
                 friend_or_gc.load_corr()
                 messages = friend_or_gc.get_corr()[-PAGE_SIZE:]
                 self._load_history = False
@@ -424,8 +421,8 @@ class Profile(basecontact.BaseContact, Singleton):
             friend.inc_receipts()
             if friend.status is not None:
                 self.split_and_send(friend.number, message_type, text.encode('utf-8'))
+            t = time.time()
             if friend.number == self.get_active_number():
-                t = time.time()
                 self.create_message_item(text, t, MESSAGE_OWNER['NOT_SENT'], message_type)
                 self._screen.messageEdit.clear()
                 self._messages.scrollToBottom()
@@ -448,18 +445,18 @@ class Profile(basecontact.BaseContact, Singleton):
         s = Settings.get_instance()
         if hasattr(self, '_history'):
             if s['save_history']:
-                for friend in self._friends_and_gc
-                    if not self._history.friend_exists_in_db(friend.tox_id):
-                        self._history.add_friend_to_db(friend.tox_id)
+                for friend_or_gc in self._friends_and_gc:
+                    if not self._history.friend_exists_in_db(friend_or_gc.tox_id):
+                        self._history.add_friend_to_db(friend_or_gc.tox_id)
                     if not s['save_unsent_only']:
-                        messages = friend.get_corr_for_saving()
+                        messages = friend_or_gc.get_corr_for_saving()
                     else:
-                        messages = friend.get_unsent_messages_for_saving()
-                        self._history.delete_messages(friend.tox_id)
-                    self._history.save_messages_to_db(friend.tox_id, messages)
-                    unsent_messages = friend.get_unsent_messages()
+                        messages = friend_or_gc.get_unsent_messages_for_saving()
+                        self._history.delete_messages(friend_or_gc.tox_id)
+                    self._history.save_messages_to_db(friend_or_gc.tox_id, messages)
+                    unsent_messages = friend_or_gc.get_unsent_messages()
                     unsent_time = unsent_messages[0].get_data()[2] if len(unsent_messages) else time.time() + 1
-                    self._history.update_messages(friend.tox_id, unsent_time)
+                    self._history.update_messages(friend_or_gc.tox_id, unsent_time)
             self._history.save()
             del self._history
 
@@ -474,7 +471,7 @@ class Profile(basecontact.BaseContact, Singleton):
                 self._history.delete_messages(friend.tox_id)
                 self._history.delete_friend_from_db(friend.tox_id)
         else:  # clear all history
-            for number in range(len(self._friends_and_gc))):
+            for number in range(len(self._friends_and_gc)):
                 self.clear_history(number, save_unsent)
 
         if num is None or num == self.get_active_number():
@@ -808,8 +805,8 @@ class Profile(basecontact.BaseContact, Singleton):
         if hasattr(self, '_call'):
             self._call.stop()
             del self._call
-        for i in range(len(self._friends)):
-            del self._friends[0]
+        for i in range(len(self._friends_and_gc)):
+            del self._friends_and_gc[0]
 
     # -----------------------------------------------------------------------------------------------------------------
     # File transfers support