Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10211 - in trunk: . src/common
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 11:10:07 +0200 (Tue, 12 Aug 2008) New Revision: 10211 Modified: trunk/configure.ac trunk/src/common/defs.py Log: prepare sources for 0.12-alpha Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-08-12 09:08:47 UTC (rev 10210) +++ trunk/configure.ac 2008-08-12 09:10:07 UTC (rev 10211) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11.4.4-svn],[http://trac.gajim.org/],[gajim]) + [0.12-alpha],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-08-12 09:08:47 UTC (rev 10210) +++ trunk/src/common/defs.py 2008-08-12 09:10:07 UTC (rev 10211) @@ -3,10 +3,10 @@ docdir = '../' datadir = '../' -version = '0.11.4.4-svn' +version = '0.12-alpha' import sys, os.path for base in ('.', 'common'): sys.path.append(os.path.join(base, '.libs')) -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3:

1 0

[commit-gajim] r10210 - trunk/src
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 11:08:47 +0200 (Tue, 12 Aug 2008) New Revision: 10210 Modified: trunk/src/roster_window.py Log: send invitation to groupchat to correct resource when inviting self contact. fixes #3799 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-12 08:53:09 UTC (rev 10209) +++ trunk/src/roster_window.py 2008-08-12 09:08:47 UTC (rev 10210) @@ -5864,8 +5864,13 @@ contact_list, account, self.on_invite_to_new_room, cap=NS_MUC)) elif len(list_) == 1 and gajim.capscache.is_supported(contact, NS_MUC): invite_menuitem.set_sensitive(True) + # use resource if it's self contact + if contact.jid == gajim.get_jid_from_account(account): + resource = contact.resource + else: + resource = None invite_to_new_room_menuitem.connect('activate', - self.on_invite_to_new_room, list_) + self.on_invite_to_new_room, list_, resource) else: invite_menuitem.set_sensitive(False) # transform None in 'jabber' @@ -5901,8 +5906,13 @@ contact_list, account, self.on_invite_to_room, room_jid, account)) else: + # use resource if it's self contact + if contact.jid == gajim.get_jid_from_account(account): + resource = contact.resource + else: + resource = None menuitem.connect('activate', self.on_invite_to_room, list_, - room_jid, account) + room_jid, account, resource) invite_to_submenu.append(menuitem) def get_and_connect_advanced_menuitem_menu(self, account):

1 0

[commit-gajim] r10209 - trunk/src
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 10:53:09 +0200 (Tue, 12 Aug 2008) New Revision: 10209 Modified: trunk/src/chat_control.py trunk/src/gajim.py Log: fix some resource problems. see #3799 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-12 08:17:02 UTC (rev 10208) +++ trunk/src/chat_control.py 2008-08-12 08:53:09 UTC (rev 10209) @@ -1144,6 +1144,12 @@ if not session: session = gajim.connections[self.account]. \ find_controlless_session(self.contact.jid) + if session: + # Don't use previous session if we want to a specific resource + # and it's not the same + j, r = gajim.get_room_and_nick_from_fjid(str(session.jid)) + if resource and resource != r: + session = None if session: session.control = self Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-12 08:17:02 UTC (rev 10208) +++ trunk/src/gajim.py 2008-08-12 08:53:09 UTC (rev 10209) @@ -2670,7 +2670,7 @@ mw = self.msg_win_mgr.get_window(fjid, account) if not mw: - mw = self.msg_win_mgr.create_window(contact, account, type_) + mw = self.msg_win_mgr.create_window(contact, account, type_, resource) chat_control = ChatControl(mw, contact, account, session, resource)

1 0

[commit-gajim] r10208 - trunk/src
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 10:17:02 +0200 (Tue, 12 Aug 2008) New Revision: 10208 Modified: trunk/src/gajim.py Log: some coding standards Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-12 08:07:39 UTC (rev 10207) +++ trunk/src/gajim.py 2008-08-12 08:17:02 UTC (rev 10208) @@ -2619,7 +2619,7 @@ is_continued=is_continued) mw.new_tab(gc_control) - def new_private_chat(self, gc_contact, account, session = None): + def new_private_chat(self, gc_contact, account, session=None): contact = gajim.contacts.contact_from_gc_contact(gc_contact) type_ = message_control.TYPE_PM fjid = gc_contact.room_jid + '/' + gc_contact.name @@ -2660,7 +2660,7 @@ return session.control - def new_chat(self, contact, account, resource = None, session = None): + def new_chat(self, contact, account, resource=None, session=None): # Get target window, create a control, and associate it with the window type_ = message_control.TYPE_CHAT @@ -2725,8 +2725,8 @@ ctrl = win.get_control(fjid, account) if not ctrl: - ctrl = self.new_chat(contact, account, - resource = resource, session = session) + ctrl = self.new_chat(contact, account, resource=resource, + session=session) # last message is long time ago gajim.last_message_time[account][ctrl.get_full_jid()] = 0

1 0

[commit-gajim] r10207 - trunk/src
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 10:07:39 +0200 (Tue, 12 Aug 2008) New Revision: 10207 Modified: trunk/src/roster_window.py Log: use highest prio contact when we dubble click on a contact Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-12 07:30:31 UTC (rev 10206) +++ trunk/src/roster_window.py 2008-08-12 08:07:39 UTC (rev 10207) @@ -3445,7 +3445,7 @@ return jid = model[path][C_JID].decode('utf-8') resource = None - contact = gajim.contacts.get_first_contact_from_jid(account, jid) + contact = gajim.contacts.get_contact_with_highest_priority(account, jid) titer = model.get_iter(path) if contact.is_groupchat(): first_ev = gajim.events.get_first_event(account, jid)

1 0

[commit-gajim] r10206 - trunk
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 09:30:31 +0200 (Tue, 12 Aug 2008) New Revision: 10206 Modified: trunk/ChangeLog Log: updated changelog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-12 07:18:16 UTC (rev 10205) +++ trunk/ChangeLog 2008-08-12 07:30:31 UTC (rev 10206) @@ -2,6 +2,7 @@ * SECURITY * Support for End-To-End encryption (XEP-0116) + * SSL certificat verification * Improve GPG support (#2390, #2783) * Ability to disable message previews in notify popups @@ -33,7 +34,7 @@ * Support of PEP (Personal Eventing Protocol) (XEP-0163) * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications) * Modified the format of emoticons list file, so we can choose the default code (#3696) - * Support for Remote Controlling Clients (XEP-0146): Leave groupchats, change status, forward unread messages + * New Remote Controlling Option (XEP-0146): forward unread messages * Support for User Search (XEP-0055) * Support for jabber:x:data in message elements (Part of XEP-OO04) * Added a «supported features» window

1 0

[commit-gajim] r10205 - www-website
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 09:18:16 +0200 (Tue, 12 Aug 2008) New Revision: 10205 Modified: www-website/downloads.php Log: another typo Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2008-08-12 07:15:40 UTC (rev 10204) +++ www-website/downloads.php 2008-08-12 07:18:16 UTC (rev 10205) @@ -6,7 +6,7 @@ print (" \n"); print _(" Latest version of Gajim is")." 0.11.4 \n"; -sprintf(_(" A %s version is in test"), "0.12-alpha"); +printf(_(" A %s version is in test"), "0.12-alpha"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n";

1 0

[commit-gajim] r10204 - www-website
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 09:15:40 +0200 (Tue, 12 Aug 2008) New Revision: 10204 Modified: www-website/downloads.php Log: typo Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2008-08-12 07:15:07 UTC (rev 10203) +++ www-website/downloads.php 2008-08-12 07:15:40 UTC (rev 10204) @@ -7,7 +7,7 @@ print (" \n"); print _(" Latest version of Gajim is")." 0.11.4 \n"; sprintf(_(" A %s version is in test"), "0.12-alpha"); -print (" \n"; +print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n";

1 0

[commit-gajim] r10203 - www-website
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 09:15:07 +0200 (Tue, 12 Aug 2008) New Revision: 10203 Modified: www-website/downloads.php Log: show both 0.11.4 and 0.12 versions in download page Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2008-08-12 07:08:33 UTC (rev 10202) +++ www-website/downloads.php 2008-08-12 07:15:07 UTC (rev 10203) @@ -5,7 +5,9 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); print (" \n"); -print _(" Latest version of Gajim is")." 0.12-alpha \n"; +print _(" Latest version of Gajim is")." 0.11.4 \n"; +sprintf(_(" A %s version is in test"), "0.12-alpha"); +print (" \n"; print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -126,9 +128,9 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" Here is a")." <a href=\"http://varcache.org/~midar/gajim/releases/gajim-0.12-alpha1.exe\">"._("Gajim installer")."</a>.\n"; -#print _(" There is a Gajim installer ")." <a href=\"downloads/gajim-0.11.4+gtk-4.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.4-1.exe\">"._("without GTK+")."</a>.\n"; -#print (" \n"); +print _(" There is a Gajim installer ")." <a href=\"downloads/gajim-0.11.4+gtk-4.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.4-1.exe\">"._("without GTK+")."</a>.\n"; +print (" \n"); +print _(" Here is a")." <a href=\"http://varcache.org/~midar/gajim/releases/gajim-0.12-alpha1.exe\">"._("Gajim installer")."</a> "._("for 0.12-alpha version").".\n"; #print _(" There is a Gajim installer for 0.11.2 pre-release ")." <a href=\"downloads/gajim-0.11.2+gtk-pre1.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.2-pre1.exe\">"._("without GTK+")."</a>.\n"; #print (" \n"); #print _(" If you got the installer without GTK, you will have to download the latest version of the GTK+ Runtime Environment")." <a href=\"http://gladewin32.sourceforge.net/\">"._("here")."</a>. "._("You can skip this, if you already have a GTK+ Runtime installed with libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade is missing)");

1 0

[commit-gajim] r10202 - www-website
by asterix＠gajim.org 12 Aug '08

12 Aug '08

Author: asterix Date: 2008-08-12 09:08:33 +0200 (Tue, 12 Aug 2008) New Revision: 10202 Modified: www-website/downloads.php Log: update download page for 0.12 alpha Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2008-08-12 06:57:28 UTC (rev 10201) +++ www-website/downloads.php 2008-08-12 07:08:33 UTC (rev 10202) @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); print (" \n"); -print _(" Latest version of Gajim is")." 0.11.4 \n"; +print _(" Latest version of Gajim is")." 0.12-alpha \n"; print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -113,11 +113,11 @@ print _(" Autopackage\n"); print (" </h2>\n"); print ("</a>\n"); -#print _("Soon available here."); -print _(" You can download the autopackage ")."<a href=\"downloads/gajim-0.11.4-1.x86.package\">"._("here")."</a>.\n"; -print _("To use it: make it executable, run it and follow the instructions.\n"); -print ("<a href=\"http://autopackage.org/using.html\">"); -print _("Find out more")."</a>.\n"; +print _("Soon available here."); +#print _(" You can download the autopackage ")."<a href=\"downloads/gajim-0.12-1.x86.package\">"._("here")."</a>.\n"; +#print _("To use it: make it executable, run it and follow the instructions.\n"); +#print ("<a href=\"http://autopackage.org/using.html\">"); +#print _("Find out more")."</a>.\n"; print (" \n"); @@ -126,11 +126,12 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" There is a Gajim installer ")." <a href=\"downloads/gajim-0.11.4+gtk-4.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.4-1.exe\">"._("without GTK+")."</a>.\n"; -print (" \n"); +print _(" Here is a")." <a href=\"http://varcache.org/~midar/gajim/releases/gajim-0.12-alpha1.exe\">"._("Gajim installer")."</a>.\n"; +#print _(" There is a Gajim installer ")." <a href=\"downloads/gajim-0.11.4+gtk-4.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.4-1.exe\">"._("without GTK+")."</a>.\n"; +#print (" \n"); #print _(" There is a Gajim installer for 0.11.2 pre-release ")." <a href=\"downloads/gajim-0.11.2+gtk-pre1.exe\">"._("with GTK+ included")."</a> "._("and")." <a href=\"downloads/gajim-0.11.2-pre1.exe\">"._("without GTK+")."</a>.\n"; #print (" \n"); -print _(" If you got the installer without GTK, you will have to download the latest version of the GTK+ Runtime Environment")." <a href=\"http://gladewin32.sourceforge.net/\">"._("here")."</a>. "._("You can skip this, if you already have a GTK+ Runtime installed with libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade is missing)"); +#print _(" If you got the installer without GTK, you will have to download the latest version of the GTK+ Runtime Environment")." <a href=\"http://gladewin32.sourceforge.net/\">"._("here")."</a>. "._("You can skip this, if you already have a GTK+ Runtime installed with libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade is missing)"); print (" \n"); print ("<a name=\"tarball\">\n"); @@ -139,7 +140,7 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.11.4.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/branches/gajim_0.11.4/README.html?format=raw\">see the <tt>README</tt></a> ("._("in English")."). \n"; -#print _(" The tarball version of 0.11.2 pre-release is ")."<a href=\"downloads/gajim-0.11.2-pre1.tar.gz\">"._("here")."</a>. \n"; +print _(" The tarball version of 0.12 alpha-release is ")."<a href=\"downloads/gajim-0.12-alpha1.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the subversion repository.\n");

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

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 August 2008