diff options
| author | Dan Williams <dcbw@localhost.localdomain> | 2006-07-24 15:57:21 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@localhost.localdomain> | 2006-07-24 15:57:21 (GMT) |
| commit | ba6c75725d633605195515b84b8056d2fb27d735 (patch) | |
| tree | 44d228d5f03da12d851a9497e2865e570ffcb48f | |
| parent | a216a19f3f62eba01de33db81143c2d6e54f568e (diff) | |
Fix occurances of get_nick_name() -> get_name()
| -rw-r--r-- | activities/browser/BrowserActivity.py | 2 | ||||
| -rw-r--r-- | shell/PresenceView.py | 2 | ||||
| -rw-r--r-- | sugar/chat/Chat.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index 5cb64c0..e9e0671 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -116,7 +116,7 @@ class BrowserActivity(Activity): # Create our activity-specific browser sharing service self._model = LocalModel(self, self._pservice, self._share_service) - self._model.set_value('owner', self._pservice.get_owner().get_nick_name()) + self._model.set_value('owner', self._pservice.get_owner().get_name()) self._update_shared_location() self.set_mode(BrowserActivity.LEADING) diff --git a/shell/PresenceView.py b/shell/PresenceView.py index 4b471bc..4662e65 100644 --- a/shell/PresenceView.py +++ b/shell/PresenceView.py @@ -136,7 +136,7 @@ class PresenceView(gtk.VBox): aniter = self._buddy_store.append(None) self._buddy_store.set(aniter, - self._MODEL_COL_NICK, buddy.get_nick_name(), + self._MODEL_COL_NICK, buddy.get_name(), self._MODEL_COL_BUDDY, buddy, self._MODEL_COL_VISIBLE, self._is_buddy_visible(buddy)) buddy.connect('icon-changed', self.__buddy_icon_changed_cb) diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py index df6e48a..db4255f 100644 --- a/sugar/chat/Chat.py +++ b/sugar/chat/Chat.py @@ -108,7 +108,7 @@ class Chat(gtk.VBox): if icon: rise = int(icon.get_height() / 4) * -1 - hash_string = "%s-%s" % (buddy.get_nick_name(), buddy.get_address()) + hash_string = "%s-%s" % (buddy.get_name(), buddy.get_ip4_address()) sha_hash = sha.new() sha_hash.update(hash_string) tagname = "buddyicon-%s" % sha_hash.hexdigest() @@ -127,7 +127,7 @@ class Chat(gtk.VBox): buf.create_tag("nickname", weight=pango.WEIGHT_BOLD) aniter = buf.get_end_iter() offset = aniter.get_offset() - buf.insert(aniter, " " + buddy.get_nick_name() + ": ") + buf.insert(aniter, " " + buddy.get_name() + ": ") enditer = buf.get_iter_at_offset(offset) buf.apply_tag_by_name("nickname", aniter, enditer) @@ -216,7 +216,7 @@ class Chat(gtk.VBox): # FIXME a better way to compare buddies? owner = self._pservice.get_owner() - if buddy.get_nick_name() == owner.get_nick_name(): + if buddy.get_name() == owner.get_name(): return chunk = self._get_first_richtext_chunk(msg) @@ -245,14 +245,14 @@ class Chat(gtk.VBox): if self._stream_writer: self._stream_writer.write(self.serialize_message(text)) else: - print 'Cannot send message, there is no stream writer' + logging.warning("Cannot send message, there is no stream writer") owner = self._pservice.get_owner() if owner: self._insert_rich_message(owner, text) def serialize_message(self, message): owner = self._pservice.get_owner() - return owner.get_nick_name() + '||' + message + return owner.get_name() + '||' + message def deserialize_message(message): return message.split('||', 1) |