Changeset 7984 for branches/gajim_0.11/src/common

Timestamp:

02/15/07 19:05:38 (22 months ago)

Author:

asterix

Message:

mrege diff from trunk

Location:

branches/gajim_0.11/src/common

Files:

• connection.py (modified) (3 diffs)
• dataforms.py (modified) (2 diffs)

branches/gajim_0.11/src/common/connection.py

@@ -638 +638 @@
                         msg = ''
                 keyID = gajim.config.get_per('accounts', self.name, 'keyid')
-                if keyID and USE_GPG and not msg:
-                        lowered_uf_status_msg = helpers.get_uf_show(show).lower()
-                        # do not show I'm invisible!
-                        if lowered_uf_status_msg == _('invisible').lower():
-                                lowered_uf_status_msg = _('offline').lower()
-                        msg = _("I'm %s") % lowered_uf_status_msg
                 signed = ''
                 if not auto and not show == 'offline':
@@ -1058 +1052 @@
                 self.connection.send(p)
 
-                #last date/time in history to avoid duplicate
+                # last date/time in history to avoid duplicate
                 if not self.last_history_line.has_key(room_jid): 
                         # Not in memory, get it from DB
@@ -1086 +1080 @@
                         to = room_jid)
                 self.connection.send(iq)
-
-        def change_gc_nick(self, room_jid, nick):
-                if not self.connection:
-                        return
-                p = common.xmpp.Presence(to = '%s/%s' % (room_jid, nick))
-                p = self.add_sha(p)
-                self.connection.send(p)
 
         def send_gc_status(self, nick, jid, show, status):

branches/gajim_0.11/src/common/dataforms.py

@@ -367 +367 @@
                 def fget(self):
                         value = u''
-                        for valuenode in self.getTags('value'):
+                        for valuenode in self.getTags('instructions'):
                                 value += '\n' + valuenode.getData()
                         return value[1:]
@@ -374 +374 @@
                         if value == '': return
                         for line in value.split('\n'):
-                                self.addChild('value').setData(line)
-                def fdel(self):
-                        for value in self.getTags('value'):
+                                self.addChild('instructions').setData(line)
+                def fdel(self):
+                        for value in self.getTags('instructions'):
                                 self.delChild(value)
                 return locals()