Changeset 7829 for branches/gajim_0.11/src/groupchat_control.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/groupchat_control.py (modified) (10 diffs)

branches/gajim_0.11/src/groupchat_control.py

@@ -181 +181 @@
                 self.name = self.room_jid.split('@')[0]
 
-                self.hide_chat_buttons_always = gajim.config.get(
+                hide_chat_buttons_always = gajim.config.get(
                         'always_hide_groupchat_buttons')
-                self.chat_buttons_set_visible(self.hide_chat_buttons_always)
+                self.chat_buttons_set_visible(hide_chat_buttons_always)
                 self.widget_set_visible(self.xml.get_widget('banner_eventbox'),
                         gajim.config.get('hide_groupchat_banner'))
                 self.widget_set_visible(self.xml.get_widget('list_scrolledwindow'),
                         gajim.config.get('hide_groupchat_occupants_list'))
-                self.gc_refer_to_nick_char = gajim.config.get('gc_refer_to_nick_char')
 
                 self._last_selected_contact = None # None or holds jid, account tuple
@@ -302 +301 @@
                 self.list_treeview.set_expander_column(column)
 
-                self.draw_banner()
-                self.got_disconnected() # init some variables
+                gajim.gc_connected[self.account][self.room_jid] = False
+                # disable win, we are not connected yet
+                ChatControlBase.got_disconnected(self) 
 
                 self.update_ui()
@@ -452 +452 @@
                 banner_status_img.set_from_pixbuf(scaled_pix)
 
-        def draw_banner(self):  
-                '''Draw the fat line at the top of the window that 
-                houses the muc icon, room jid, subject. 
+        def draw_banner_text(self):
+                '''Draw the text in the fat line at the top of the window that 
+                houses the room jid, subject. 
                 '''
-                ChatControlBase.draw_banner(self)
-
                 self.name_label.set_ellipsize(pango.ELLIPSIZE_END)
                 font_attrs, font_attrs_small = self.get_font_attrs()
@@ -726 +724 @@
         def set_subject(self, subject):
                 self.subject = subject
-                self.draw_banner()
+                self.draw_banner_text()
 
         def got_connected(self):
                 gajim.gc_connected[self.account][self.room_jid] = True
                 ChatControlBase.got_connected(self)
-                self.draw_banner()
+                # We don't redraw the whole banner here, because only icon change
+                self._update_banner_state_image()
 
         def got_disconnected(self):
@@ -741 +740 @@
                         gajim.contacts.remove_gc_contact(self.account, gc_contact)
                 gajim.gc_connected[self.account][self.room_jid] = False
-                # Note, since this method is called during initialization it is NOT safe
-                # to call self.parent_win.redraw_tab here
                 ChatControlBase.got_disconnected(self)
-                self.draw_banner()
+                # We don't redraw the whole banner here, because only icon change
+                self._update_banner_state_image()
 
         def draw_roster(self):
@@ -1342 +1340 @@
                                 self.handlers[i].disconnect(i)
                         del self.handlers[i]
+                # Remove unread events from systray
+                gajim.events.remove_events(self.account, self.room_jid)
 
         def allow_shutdown(self, method):
@@ -1510 +1510 @@
                                 begin = ''
 
+                        gc_refer_to_nick_char = gajim.config.get('gc_refer_to_nick_char')
                         if len(self.nick_hits) and \
                                         self.nick_hits[0].startswith(begin.replace(
-                                        self.gc_refer_to_nick_char, '')) and \
+                                        gc_refer_to_nick_char, '')) and \
                                         self.last_key_tabs: # we should cycle
                                 self.nick_hits.append(self.nick_hits[0])
@@ -1520 +1521 @@
                                 list_nick = gajim.contacts.get_nick_list(self.account,
                                                                         self.room_jid)
+                                list_nick.remove(self.nick) # Skip self
                                 for nick in list_nick:
                                         if nick.lower().startswith(begin.lower()):
@@ -1526 +1528 @@
                         if len(self.nick_hits):
                                 if len(splitted_text)  < 2: # This is the 1st word of the line or no word
-                                        add = self.gc_refer_to_nick_char + ' '
+                                        add = gc_refer_to_nick_char + ' '
                                 else:
                                         add = ' '
@@ -1779 +1781 @@
                         add = ' '
                 else:
-                        add = self.gc_refer_to_nick_char + ' '
+                        gc_refer_to_nick_char = gajim.config.get('gc_refer_to_nick_char')
+                        add = gc_refer_to_nick_char + ' '
                 message_buffer.insert_at_cursor(start + nick + add)