Commits

commits@gajim.org

17632 discussions

gajim: rename gajim-security_high / low to security-high / low. ...
by Gajim 29 Mar '14

29 Mar '14

changeset 604f0c6a3edc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=604f0c6a3edc description: rename gajim-security_high / low to security-high / low. see #7445 diffstat: icons/hicolor/16x16/status/gajim-security_high.png | Bin icons/hicolor/16x16/status/gajim-security_low.png | Bin icons/hicolor/16x16/status/security-high.png | Bin icons/hicolor/16x16/status/security-low.png | Bin icons/hicolor/32x32/actions/gajim-security_high.png | Bin icons/hicolor/32x32/actions/gajim-security_low.png | Bin icons/hicolor/32x32/status/security-high.png | Bin icons/hicolor/32x32/status/security-low.png | Bin src/chat_control.py | 4 ++-- src/dialogs.py | 12 ++++++------ 10 files changed, 8 insertions(+), 8 deletions(-) diffs (85 lines): diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/gajim-security_high.png Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/gajim-security_low.png Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/security-high.png Binary file icons/hicolor/16x16/status/security-high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/16x16/status/security-low.png Binary file icons/hicolor/16x16/status/security-low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/actions/gajim-security_high.png Binary file icons/hicolor/32x32/actions/gajim-security_high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/actions/gajim-security_low.png Binary file icons/hicolor/32x32/actions/gajim-security_low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/status/security-high.png Binary file icons/hicolor/32x32/status/security-high.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc icons/hicolor/32x32/status/security-low.png Binary file icons/hicolor/32x32/status/security-low.png has changed diff -r d3c3c850f292 -r 604f0c6a3edc src/chat_control.py --- a/src/chat_control.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/chat_control.py Sat Mar 29 18:18:04 2014 +0100 @@ -2314,11 +2314,11 @@ if authenticated: #About encrypted chat session authenticated_string = _('and authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_high') + img_path = gtkgui_helpers.get_icon_path('security-high') else: #About encrypted chat session authenticated_string = _('and NOT authenticated') - img_path = gtkgui_helpers.get_icon_path('gajim-security_low') + img_path = gtkgui_helpers.get_icon_path('security-low') self.lock_image.set_from_file(img_path) #status will become 'is' or 'is not', authentificaed will become diff -r d3c3c850f292 -r 604f0c6a3edc src/dialogs.py --- a/src/dialogs.py Sat Mar 29 17:52:22 2014 +0100 +++ b/src/dialogs.py Sat Mar 29 18:18:04 2014 +0100 @@ -5126,7 +5126,7 @@ if self.session.verified_identity: labeltext += '\n\n' + _('''You have already verified this contact's identity.''') - security_image = 'gajim-security_high' + security_image = 'security-high' if self.session.control: self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), True) @@ -5143,7 +5143,7 @@ self.session.control._show_lock_image(True, 'E2E', True, self.session.is_loggable(), False) labeltext += '\n\n' + _('''To be certain that only the expected person can read your messages or send you messages, you need to verify their identity by clicking the button below.''') - security_image = 'gajim-security_low' + security_image = 'security-low' verification_status = _('''Contact's identity NOT verified''') self.window.set_title(verification_status) @@ -5200,13 +5200,13 @@ verification_status = _('''Contact's identity NOT verified''') info = _('The contact\'s key (%s) does not match the key ' 'assigned in Gajim.') % keyID[:8] - image = 'gajim-security_low' + image = 'security-low' elif not keyID: # No key assigned nor a key is used by remote contact verification_status = _('No OpenPGP key assigned') info = _('No OpenPGP key is assigned to this contact. So you cannot' ' encrypt messages.') - image = 'gajim-security_low' + image = 'security-low' else: error = gajim.connections[account].gpg.encrypt('test', [keyID])[1] if error: @@ -5214,12 +5214,12 @@ info = _('OpenPGP key is assigned to this contact, but you ' 'do not trust his key, so message cannot be ' 'encrypted. Use your OpenPGP client to trust this key.') - image = 'gajim-security_low' + image = 'security-low' else: verification_status = _('''Contact's identity verified''') info = _('OpenPGP Key is assigned to this contact, and you ' 'trust his key, so messages will be encrypted.') - image = 'gajim-security_high' + image = 'security-high' status_label.set_markup('%s' % \ verification_status)

1 0

gajim: minimize groupchats before closing message window
by Gajim 29 Mar '14

29 Mar '14

changeset d3c3c850f292 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d3c3c850f292 description: minimize groupchats before closing message window diffstat: src/message_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r ce8b4918ebd3 -r d3c3c850f292 src/message_window.py --- a/src/message_window.py Fri Mar 28 21:48:15 2014 +0100 +++ b/src/message_window.py Sat Mar 29 17:52:22 2014 +0100 @@ -216,6 +216,9 @@ win.destroy() if not gajim.config.get('confirm_close_multiple_tabs'): + for ctrl in self.controls(): + if ctrl.minimizable(): + ctrl.minimize() # destroy window return False dialogs.YesNoDialog(

1 0

gajim: rename some icons so we don't need to check in code if in...
by Gajim 28 Mar '14

28 Mar '14

changeset ce8b4918ebd3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ce8b4918ebd3 description: rename some icons so we don't need to check in code if installed iconset has it. Fixes #7445 diffstat: icons/hicolor/16x16/actions/document-send.png | Bin icons/hicolor/16x16/actions/gajim-upload.png | Bin icons/hicolor/16x16/status/applications-internet.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin src/chat_control.py | 2 -- src/groupchat_control.py | 2 -- src/gui_interface.py | 2 -- src/gui_menu_builder.py | 2 -- 8 files changed, 0 insertions(+), 8 deletions(-) diffs (56 lines): diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/actions/document-send.png Binary file icons/hicolor/16x16/actions/document-send.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/actions/gajim-upload.png Binary file icons/hicolor/16x16/actions/gajim-upload.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/status/applications-internet.png Binary file icons/hicolor/16x16/status/applications-internet.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r 71ff18f209f0 -r ce8b4918ebd3 src/chat_control.py --- a/src/chat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/chat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -1498,8 +1498,6 @@ self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) self._send_file_button.set_image(img) id_ = self._send_file_button.connect('clicked', diff -r 71ff18f209f0 -r ce8b4918ebd3 src/groupchat_control.py --- a/src/groupchat_control.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/groupchat_control.py Fri Mar 28 21:48:15 2014 +0100 @@ -2584,8 +2584,6 @@ item = xml.get_object('send_file_menuitem') # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) item.set_image(img) diff -r 71ff18f209f0 -r ce8b4918ebd3 src/gui_interface.py --- a/src/gui_interface.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_interface.py Fri Mar 28 21:48:15 2014 +0100 @@ -2656,8 +2656,6 @@ elif isinstance(pep_obj, pep.UserLocationPEP): icon = gtkgui_helpers.get_icon_pixmap('applications-internet', quiet=True) - if not icon: - icon = gtkgui_helpers.get_icon_pixmap('gajim-earth') return icon def create_ipython_window(self): diff -r 71ff18f209f0 -r ce8b4918ebd3 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Mar 28 21:30:57 2014 +0100 +++ b/src/gui_menu_builder.py Fri Mar 28 21:48:15 2014 +0100 @@ -259,8 +259,6 @@ # add a special img for send file menuitem pixbuf = gtkgui_helpers.get_icon_pixmap('document-send', quiet=True) - if not pixbuf: - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-upload') img = gtk.image_new_from_pixbuf(pixbuf) send_file_menuitem.set_image(img)

1 0

gajim: keep treeview consistent when connecting. Fixes #7434
by Gajim 28 Mar '14

28 Mar '14

changeset 71ff18f209f0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=71ff18f209f0 description: keep treeview consistent when connecting. Fixes #7434 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0fc2a9403a8a -r 71ff18f209f0 src/roster_window.py --- a/src/roster_window.py Fri Mar 28 21:29:42 2014 +0100 +++ b/src/roster_window.py Fri Mar 28 21:30:57 2014 +0100 @@ -2627,7 +2627,7 @@ def _nec_roster_received(self, obj): if obj.received_from_server: self.fill_contacts_and_groups_dicts(obj.roster, obj.conn.name) - self.add_account_contacts(obj.conn.name) + self.add_account_contacts(obj.conn.name, improve_speed=False) self.fire_up_unread_messages_events(obj.conn.name) else: if gajim.config.get('remember_opened_chat_controls'):

1 0

gajim: update contact instance in chat window when we talk to an...
by Gajim 28 Mar '14

28 Mar '14

changeset 0fc2a9403a8a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0fc2a9403a8a description: update contact instance in chat window when we talk to another resource. Fixes #7700 diffstat: src/common/connection.py | 5 +++-- src/session.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diffs (26 lines): diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/common/connection.py --- a/src/common/connection.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/common/connection.py Fri Mar 28 21:29:42 2014 +0100 @@ -464,8 +464,9 @@ msg_iq = iqs else: msg_iq.setTo(fjid) - if resource: - contact = gajim.contacts.get_contact(self.name, jid, resource) + r_ = resource or gajim.get_resource_from_jid(fjid) + if r_: + contact = gajim.contacts.get_contact(self.name, jid, r_) else: contact = gajim.contacts.get_contact_with_highest_priority( self.name, jid) diff -r ca9f2d4ffdc5 -r 0fc2a9403a8a src/session.py --- a/src/session.py Tue Mar 25 17:19:08 2014 +0100 +++ b/src/session.py Fri Mar 28 21:29:42 2014 +0100 @@ -160,6 +160,7 @@ if ctrl: self.control = ctrl self.control.set_session(self) + self.control.contact = contact if not pm: self.roster_message2(obj)

1 0

gajim: ignore attention (XEP-224) when messages is delayed
by Gajim 27 Mar '14

27 Mar '14

changeset a9d3aa50bddd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a9d3aa50bddd description: ignore attention (XEP-224) when messages is delayed diffstat: src/common/connection_handlers_events.py | 5 ++++- src/common/protocol/bytestream.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 8898f392acb2 -r a9d3aa50bddd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/connection_handlers_events.py Mon Mar 10 21:47:21 2014 +0100 @@ -1311,7 +1311,10 @@ self.displaymarking = self.seclabel.getTag('displaymarking') if self.stanza.getTag('attention', namespace=nbxmpp.NS_ATTENTION): - self.attention = True + delayed = self.stanza.getTag('x', namespace=nbxmpp.NS_DELAY) is not\ + None + if not delayed: + self.attention = True self.form_node = self.stanza.getTag('x', namespace=nbxmpp.NS_DATA) diff -r 8898f392acb2 -r a9d3aa50bddd src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Mar 09 10:25:26 2014 +0100 +++ b/src/common/protocol/bytestream.py Mon Mar 10 21:47:21 2014 +0100 @@ -468,6 +468,9 @@ if listener: self._add_streamhosts_to_query(query, sender, ext_port, [ext_ip]) + else: + self._add_streamhosts_to_query(query, file_props.sender, + ext_port, [ext_ip]) self.connection.send(iq) cleanup_gupnp()

1 0

gajim: update windows build script for win7
by Gajim 27 Mar '14

27 Mar '14

changeset b1724179fb73 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b1724179fb73 description: update windows build script for win7 diffstat: build.bat | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a9d3aa50bddd -r b1724179fb73 build.bat --- a/build.bat Mon Mar 10 21:47:21 2014 +0100 +++ b/build.bat Sat Mar 15 09:53:20 2014 +0100 @@ -35,6 +35,6 @@ for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l -"C:\Program Files\NSIS\makensis" gajim.nsi +"C:\Program Files (x86)\NSIS\makensis" gajim.nsi cd .. \ No newline at end of file

1 0

gajim: update changelog
by Gajim 27 Mar '14

27 Mar '14

changeset 792ee48ab707 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=792ee48ab707 description: update changelog diffstat: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r b1724179fb73 -r 792ee48ab707 ChangeLog --- a/ChangeLog Sat Mar 15 09:53:20 2014 +0100 +++ b/ChangeLog Sat Mar 15 09:53:48 2014 +0100 @@ -3,6 +3,7 @@ * Improve File transfer support by adding Jingle file transfer * use external python-nbxmpp library * Improve audio / Video calls and add screensharing feature + * Support audio under windows * Support systemd-logind * Support XEP-0308 Last message correction * Support XEP-0224 Attention

1 0

gajim: remove outdated autopackage files
by Gajim 27 Mar '14

27 Mar '14

changeset 38c9e5472304 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=38c9e5472304 description: remove outdated autopackage files diffstat: autopackage/(a)dnspython.org/dnspython/skeleton.1 | 22 --- autopackage/(a)glade.gnome.org/libglade/skeleton.1 | 13 -- autopackage/(a)gnome.org/pyglade/skeleton.1 | 29 ---- autopackage/(a)gnome.org/pygtk/skeleton.1 | 24 --- autopackage/(a)gtk.org/gtk/skeleton.1 | 25 ---- autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 | 16 -- autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 | 22 --- autopackage/(a)pysqlite.org/pysqlite/skeleton.1 | 22 --- autopackage/(a)python.org/python-xml/skeleton.1 | 21 --- autopackage/(a)python.org/python/skeleton.1 | 20 --- autopackage/default.apspec | 93 --------------- 11 files changed, 0 insertions(+), 307 deletions(-) diffs (truncated from 351 to 300 lines): diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)dnspython.org/dnspython/skeleton.1 --- a/autopackage/(a)dnspython.org/dnspython/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @dnspython.org/dnspython -DisplayName: dnspython is a DNS toolkit for Python -ShortName: dnspython -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Returns the full version e.g 1.3.3 - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import dns.version - print dns.version.version -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)glade.gnome.org/libglade/skeleton.1 --- a/autopackage/(a)glade.gnome.org/libglade/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -[Meta] -RootName: @glade.gnome.org/libglade -DisplayName: Glade user interface loader library -ShortName: libglade -Skeleton-Author: Mike Hearn <mike(a)theoretic.com> -Skeleton-Version: 1 - -[Notes] -This skeleton only detects libglade1 and 2, which are assigned interface numbers 1 and 2 respectively - -[Test] -testForLib libglade.so.0 && INTERFACE_VERSIONS="1" -testForLib libglade-2.0.so.0 && INTERFACE_VERSIONS="2 $INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gnome.org/pyglade/skeleton.1 --- a/autopackage/(a)gnome.org/pyglade/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gnome.org/pyglade -DisplayName: Python bindings for Glade -ShortName: pyglade -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Pyglade is bundled within pygtk sources so they have the same versions - -[Test] -testForPythonModule gtk.glade -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=`python - <<EOF -try: - import pygtk - import gtk.glade - print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1]) -except: - pass -EOF -` -fi - -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gnome.org/pygtk/skeleton.1 --- a/autopackage/(a)gnome.org/pygtk/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gnome.org/pygtk -DisplayName: Python bindings for GTK+ -ShortName: pygtk -Skeleton-Author: Tom Cato Amundsen <tca(a)gnu.org> -Skeleton-Version: 1 - -[Notes] -Matchces GTK2 interface versioning - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import pygtk - pygtk.require("2.0") - import gtk - print "%i.%i" % (gtk.pygtk_version[0], gtk.pygtk_version[1]) -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gtk.org/gtk/skeleton.1 --- a/autopackage/(a)gtk.org/gtk/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gtk.org/gtk -DisplayName: GTK+ user interface toolkit -ShortName: gtk+ -Skeleton-Author: Hongli Lai <h.lai(a)chello.nl> -Skeleton-Version: 1 - -[Notes] -Interface versions correspond to GTK released versions, as GTK version -numbering sensibly tracks the interfaces, ie GTK2.2 has an interface -version of 2.2, not 2.1 as would be the normal rules. - -Earliest detected version is GTK 1.2 - -[Test] -testForLib libgtk-1.2.so.0 && INTERFACE_VERSIONS=" 1.2" -gtk2versions=`testForLib -v libgtk-x11-2.0.so.0` -for v in $gtk2versions; do - minor=$( IFS=.; v=( $v ); echo ${v[1]} ) - minor=$[ $minor / 100 ] - INTERFACE_VERSIONS="2.$minor $INTERFACE_VERSIONS" -done -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" # this time...... diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 --- a/autopackage/(a)gtkspell.sourceforge.net/gtkspell/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @gtkspell.sourceforge.net/gtkspell -DisplayName: GtkSpell Spell Checking Library -ShortName: gtkspell -Skeleton-Author: Timothy Ringenbach <omarvo(a)hotmail.com> -Skeleton-Version: 1 -Repository: http://www.gajim.org/downloads/gtkspell.xml - -[Notes] -This skeleton does not set SOFTWARE_VERSIONS -Interface versions start at 0. - -[Test] -INTERFACE_VERSIONS=`testForLib -i libgtkspell.so` diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 --- a/autopackage/(a)pydns.sourceforge.net/pydns/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @pydns.sourceforge.net/pydns -DisplayName: PyDNS provides a python module for performing DNS queries -ShortName: pydns -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] - - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import DNS - print DNS.__version__ -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)pysqlite.org/pysqlite/skeleton.1 --- a/autopackage/(a)pysqlite.org/pysqlite/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @pysqlite.org/pysqlite -DisplayName: Python interface for the SQLite -ShortName: pysqlite -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -pysqlite is a Python DB-API 2.0 interface for the SQLite embedded relational database engine - -[Test] -INTERFACE_VERSIONS=`python - <<EOF -try: - import pysqlite2.dbapi2 as sql - print sql.version -except: - pass -EOF -` -SOFTWARE_VERSIONS="$INTERFACE_VERSIONS" diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)python.org/python-xml/skeleton.1 --- a/autopackage/(a)python.org/python-xml/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# -*- shell-script-mode -*- - -[Meta] -RootName: @python.org/python-xml -DisplayName: Python bindings for XML -ShortName: python-xml -Skeleton-Author: Filippos Papadopoulos <filip(a)cs.uoi.gr> -Skeleton-Version: 1 - -[Notes] -Distros like SuSE split some features of core python (like xml) to python-xml e.t.c -So python-xml must have the same versions as python - -[Test] -SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' ) -testForPythonModule xml -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' ) -fi diff -r 792ee48ab707 -r 38c9e5472304 autopackage/(a)python.org/python/skeleton.1 --- a/autopackage/(a)python.org/python/skeleton.1 Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -[Meta] -RootName: @python.org/python -DisplayName: Python language runtime -ShortName: python -Skeleton-Author: Mike Hearn <mike(a)theoretic.com> -Skeleton-Version: 1 - -[Notes] -INTERFACE_VERSIONS are set to match the currently installed version using the "python" executable name. -For instance, python 2.2 causes INTERFACE_VERSIONS to contain "2.2 2.1 2.0". This skeleton assumes python1 and python2 are not parallel installed. -SOFTWARE_VERSIONS is set to the result of python -V - -[Test] -SOFTWARE_VERSIONS=$( locateCommand python -V 2>&1 | cut -f2 -d' ' ) -if [[ "$?" != "0" ]]; then - INTERFACE_VERSIONS="" -else - INTERFACE_VERSIONS=$( echo $SOFTWARE_VERSIONS | awk -F. '{print $1 "." $2}' ) -fi - diff -r 792ee48ab707 -r 38c9e5472304 autopackage/default.apspec --- a/autopackage/default.apspec Sat Mar 15 09:53:48 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -# -*-shell-script-*- - -[Meta] -RootName: @gajim.org/gajim:$SOFTWAREVERSION -DisplayName: Gajim Jabber Client -ShortName: gajim -Maintainer: The Gajim Developers <gajim-devel-subscribe(a)gajim.org> -Packager: Filippos Papadopoulos <psybases(a)gmail.com> -Summary: Gajim is a Jabber client written in Python. -URL: http://www.gajim.org/ -License: GNU General Public License, Version 2 -SoftwareVersion: 0.12-alpha1 -AutopackageTarget: 1.0 -PackageVersion: 1 - -# Only uncomment InterfaceVersion if your package exposes interfaces to other software, -# for instance if it includes DSOs or python/perl modules. See the developer guide for more info, -# or ask on autopackage-dev if you don't understand interface versioning in autopackage. -# -# InterfaceVersion: 0.0 - -[Description] -Gajim is a jabber client written in PyGTK. The goal of Gajim is to provide a full featured and easy to use xmpp -client for the GTK+ users. Gajim does not require GNOME to run, eventhough it exists with it nicely. Gajim is -released under the GNU General Public License. Features: Tabbed chat windows, Groupchat support (with MUC protocol), -File tranfers, Emoticons, URL grabber, Systray icon, GPG support, Multiple accounts support and much more! - - - -[BuildPrepare] -prepareBuild - - -[BuildUnprepare] -unprepareBuild - - -[Imports] -echo '*' | import -import <<EOF -EOF -

1 0

gajim: fix some typos
by Gajim 27 Mar '14

27 Mar '14

changeset 3cd8c331000b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3cd8c331000b description: fix some typos diffstat: src/common/gajim.py | 2 +- src/common/jingle_content.py | 2 +- src/common/jingle_xtls.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diffs (36 lines): diff -r 38c9e5472304 -r 3cd8c331000b src/common/gajim.py --- a/src/common/gajim.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/gajim.py Thu Mar 27 13:21:28 2014 +0100 @@ -185,7 +185,7 @@ HAVE_FARSTREAM = True try: - if os.name == 'nt' + if os.name == 'nt': os.environ['FS_PLUGIN_PATH'] = 'gtk\\lib\\farstream-0.1' os.environ['GST_PLUGIN_PATH'] = 'gtk\\lib\\gstreamer-0.10' import gi diff -r 38c9e5472304 -r 3cd8c331000b src/common/jingle_content.py --- a/src/common/jingle_content.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/jingle_content.py Thu Mar 27 13:21:28 2014 +0100 @@ -223,7 +223,7 @@ if cert: try: digest_algo = cert.get_signature_algorithm().split('With')[0] - except AttributeError, e: + except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256" security.addChild('fingerprint').addData(cert.digest( diff -r 38c9e5472304 -r 3cd8c331000b src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Mar 15 11:23:27 2014 +0100 +++ b/src/common/jingle_xtls.py Thu Mar 27 13:21:28 2014 +0100 @@ -194,7 +194,7 @@ if cert: try: digest_algo = cert.get_signature_algorithm().split('With')[0] - except AttributeError, e: + except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256" if cert.digest(digest_algo) == fingerprint:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits