Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: [roidelapluie] Added initial support for Roster Item Exch...
by vardo＠lagaule.org 21 Jun '09

21 Jun '09

changeset 6865725a78f6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6865725a78f6 description: [roidelapluie] Added initial support for Roster Item Exchange (XEP-0144) based on ticket #378. Only handling NS_ROSTERX 'set' operations is supported and tested as of now. diffstat: data/glade/roster_item_exchange_window.glade | 99 ++++ src/common/connection_handlers.py | 28 + src/common/gajim.py | 2 +- src/dialogs.py | 767 ++++++++++++++++++++----------- src/gajim.py | 5 + 5 files changed, 613 insertions(+), 288 deletions(-) diffs (truncated from 2069 to 300 lines): diff -r d995f399fca8 -r 6865725a78f6 data/glade/roster_item_exchange_window.glade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/glade/roster_item_exchange_window.glade Sun Jun 21 03:43:57 2009 +0200 @@ -0,0 +1,99 @@ +<?xml version="1.0"?> +<glade-interface> +  +  + <widget class="GtkWindow" id="roster_item_exchange_window"> + <property name="title" translatable="yes">Roster Item Exchange</property> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="type_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">someone(a)somewhere.com would like you to add some contacts in your roster.</property> + <property name="use_markup">True</property> + <property name="justify">center</property> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="body_scrolledwindow"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkTextView" id="body_textview"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="editable">False</property> + <property name="justification">center</property> + <property name="cursor_visible">False</property> + <property name="text" translatable="yes">Message Body</property> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkTreeView" id="items_list_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="spacing">3</property> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </widget> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="accept_button"> + <property name="label" translatable="yes">gtk-ok</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_accept_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + </child> + </widget> +</glade-interface> diff -r d995f399fca8 -r 6865725a78f6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Jun 19 23:10:16 2009 +0200 +++ b/src/common/connection_handlers.py Sun Jun 21 03:43:57 2009 +0200 @@ -1771,6 +1771,27 @@ self.dispatch('GMAIL_NOTIFY', (jid, newmsgs, gmail_messages_list)) raise common.xmpp.NodeProcessed + + def _rosterItemExchangeCB(self, con, msg): + ''' XEP-0144 Roster Item Echange ''' + exchange_items_list = {} + jid_from = msg.getAttr('from') + items_list = msg.getTag('x').getChildren() + action = items_list[0].getAttr('action') + if action == None: + action = 'add' + for item in msg.getTag('x').getChildren(): + jid = item.getAttr('jid') + name = item.getAttr('name') + groups=[] + for group in item.getChildren(): + groups.append(group.getData()) + exchange_items_list[jid] = [] + exchange_items_list[jid].append(name) + exchange_items_list[jid].append(groups) + self.dispatch('ROSTERX', (action, exchange_items_list, jid_from)) + + def _messageCB(self, con, msg): '''Called when we receive a message''' log.debug('MessageCB') @@ -1780,6 +1801,11 @@ if msg.getTag('error') is None: self._pubsubEventCB(con, msg) return + + # check if the message is a roster item exchange (XEP-0144) + #if msg.getTag('x') and msg.getTag('x').namespace == common.xmpp.NS_ROSTERX: + #self._rosterItemExchangeCB(con, msg) + #return # check if the message is a XEP-0070 confirmation request if msg.getTag('confirm', namespace=common.xmpp.NS_HTTP_AUTH): @@ -2579,6 +2605,8 @@ common.xmpp.NS_ROSTER) con.RegisterHandler('iq', self._siSetCB, 'set', common.xmpp.NS_SI) + con.RegisterHandler('iq', self._rosterItemExchangeCB, 'set', + common.xmpp.NS_ROSTERX) con.RegisterHandler('iq', self._siErrorCB, 'error', common.xmpp.NS_SI) con.RegisterHandler('iq', self._siResultCB, 'result', diff -r d995f399fca8 -r 6865725a78f6 src/common/gajim.py --- a/src/common/gajim.py Fri Jun 19 23:10:16 2009 +0200 +++ b/src/common/gajim.py Sun Jun 21 03:43:57 2009 +0200 @@ -195,7 +195,7 @@ 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, - xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK] + xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX] # Optional features gajim supports per account gajim_optional_features = {} diff -r d995f399fca8 -r 6865725a78f6 src/dialogs.py --- a/src/dialogs.py Fri Jun 19 23:10:16 2009 +0200 +++ b/src/dialogs.py Sun Jun 21 03:43:57 2009 +0200 @@ -88,7 +88,7 @@ if self.changes_made: for (contact, account) in self.list_: gajim.connections[account].update_contact(contact.jid, contact.name, - contact.groups) + contact.groups) def on_edit_groups_dialog_response(self, widget, response_id): if response_id == gtk.RESPONSE_CLOSE: @@ -200,7 +200,7 @@ class PassphraseDialog: '''Class for Passphrase dialog''' def __init__(self, titletext, labeltext, checkbuttontext=None, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None): self.xml = gtkgui_helpers.get_glade('passphrase_dialog.glade') self.window = self.xml.get_widget('passphrase_dialog') self.passphrase_entry = self.xml.get_widget('passphrase_entry') @@ -236,7 +236,7 @@ if self.check: checked = self.xml.get_widget('save_passphrase_checkbutton').\ - get_active() + get_active() else: checked = False @@ -259,7 +259,7 @@ class ChooseGPGKeyDialog: '''Class for GPG key dialog''' def __init__(self, title_text, prompt_text, secret_keys, on_response, - selected=None): + selected=None): '''secret_keys : {keyID: userName, ...}''' self.on_response = on_response xml = gtkgui_helpers.get_glade('choose_gpg_key_dialog.glade') @@ -275,11 +275,11 @@ #columns renderer = gtk.CellRendererText() col = self.keys_treeview.insert_column_with_attributes(-1, _('KeyID'), - renderer, text = 0) + renderer, text = 0) col.set_sort_column_id(0) renderer = gtk.CellRendererText() col = self.keys_treeview.insert_column_with_attributes(-1, - _('Contact name'), renderer, text=1) + _('Contact name'), renderer, text=1) col.set_sort_column_id(1) self.keys_treeview.set_search_column(1) self.fill_tree(secret_keys, selected) @@ -303,7 +303,7 @@ (model, iter_) = selection.get_selected() if iter_ and response == gtk.RESPONSE_OK: keyID = [ model[iter_][0].decode('utf-8'), - model[iter_][1].decode('utf-8') ] + model[iter_][1].decode('utf-8') ] else: keyID = None self.on_response(keyID) @@ -320,8 +320,8 @@ class ChangeActivityDialog: PAGELIST = ['doing_chores', 'drinking', 'eating', 'exercising', 'grooming', - 'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling', - 'working'] + 'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling', + 'working'] def __init__(self, on_response, activity=None, subactivity=None, text=''): self.on_response = on_response @@ -359,13 +359,13 @@ hbox = gtk.HBox(False, 5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category), - False, False, 0) + False, False, 0) lbl = gtk.Label('' + pep.ACTIVITIES[category]['category'] + '') lbl.set_use_markup(True) hbox.pack_start(lbl, False, False, 0) rbtns[act].add(hbox) rbtns[act].connect('toggled', self.on_rbtn_toggled, - [category, 'other']) + [category, 'other']) vbox.pack_start(rbtns[act], False, False, 0) activities = [] @@ -386,11 +386,11 @@ hbox = gtk.HBox(False, 5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category, - activity), False, False, 0) + activity), False, False, 0) hbox.pack_start(gtk.Label(pep.ACTIVITIES[category][activity]), - False, False, 0) + False, False, 0) rbtns[act].connect('toggled', self.on_rbtn_toggled, - [category, activity]) + [category, activity]) rbtns[act].add(hbox) vbox.pack_start(rbtns[act], False, False, 0) @@ -432,7 +432,7 @@ ''' if self.checkbutton.get_active(): self.on_response(self.activity, self.subactivity, - self.entry.get_text().decode('utf-8')) + self.entry.get_text().decode('utf-8')) else: self.on_response(None, None, '') self.window.destroy() @@ -460,7 +460,7 @@ no_mood_button = self.xml.get_widget('no_mood_button') no_mood_button.set_mode(False) no_mood_button.connect('clicked', - self.on_mood_button_clicked, None) + self.on_mood_button_clicked, None) x = 1 y = 0 @@ -479,7 +479,7 @@ self.mood_buttons[mood].set_relief(gtk.RELIEF_NONE) gtk.Tooltips().set_tip(self.mood_buttons[mood], pep.MOODS[mood]) self.mood_buttons[mood].connect('clicked', - self.on_mood_button_clicked, mood) + self.on_mood_button_clicked, mood) table.attach(self.mood_buttons[mood], x, x + 1, y, y + 1) # Calculate the next position @@ -536,17 +536,17 @@ uf_show = helpers.get_uf_show(show)

1 0

gajim: check (py)gtk version at configure time
by Yann Leboulanger 19 Jun '09

19 Jun '09

changeset d995f399fca8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d995f399fca8 description: check (py)gtk version at configure time diffstat: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 94d709743822 -r d995f399fca8 configure.ac --- a/configure.ac Fri Jun 19 07:23:08 2009 +0200 +++ b/configure.ac Fri Jun 19 23:10:16 2009 +0200 @@ -39,7 +39,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.8.0 pygtk-2.0 >= 2.8.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0`

1 0

gajim: prevent traceback when we get malformed data in adhoc pro...
by Yann Leboulanger 19 Jun '09

19 Jun '09

changeset 94d709743822 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94d709743822 description: prevent traceback when we get malformed data in adhoc process. diffstat: src/adhoc_commands.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 25632b9aa818 -r 94d709743822 src/adhoc_commands.py --- a/src/adhoc_commands.py Fri Jun 19 07:20:19 2009 +0200 +++ b/src/adhoc_commands.py Fri Jun 19 07:23:08 2009 +0200 @@ -297,7 +297,9 @@ self.send_command(action) def stage3_next_form(self, command): - assert isinstance(command, xmpp.Node) + if not isinstance(command, xmpp.Node): + self.stage5(error=_('Service sent malformed data'), senderror=True) + return self.remove_pulsing() self.sending_form_progressbar.hide() @@ -307,6 +309,7 @@ elif self.sessionid != command.getAttr('sessionid'): self.stage5(error=_('Service changed the session identifier.'), senderror=True) + return self.form_status = command.getAttr('status')

1 0

gajim: [olivier] clean activity / mood buttons when changing sta...
by Yann Leboulanger 19 Jun '09

19 Jun '09

changeset 25632b9aa818 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25632b9aa818 description: [olivier] clean activity / mood buttons when changing status. Fixes #5104 diffstat: src/dialogs.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (21 lines): diff -r a9e216d371b2 -r 25632b9aa818 src/dialogs.py --- a/src/dialogs.py Tue Jun 16 15:14:09 2009 +0200 +++ b/src/dialogs.py Fri Jun 19 07:20:19 2009 +0200 @@ -625,6 +625,8 @@ # gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) if self.pep_dict['activity_text']: label.set_text(self.pep_dict['activity_text']) + else: + label.set_text('') else: img.set_from_pixbuf(None) label.set_text('') @@ -638,6 +640,8 @@ self.pep_dict['mood']).get_pixbuf()) if self.pep_dict['mood_text']: label.set_text(self.pep_dict['mood_text']) + else: + label.set_text('') else: img.set_from_pixbuf(None) label.set_text('')

1 0

gajim-website: better string for PLD
by Yann Leboulanger 16 Jun '09

16 Jun '09

changeset cc33975af1be in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=cc33975af1be description: better string for PLD diffstat: downloads.php | 2 +- locale/bg_BG/LC_MESSAGES/msg.po | 12 ++++++++---- locale/de_DE/LC_MESSAGES/msg.po | 10 +++++++--- locale/eo/LC_MESSAGES/msg.po | 20 ++++++++++---------- locale/es_ES/LC_MESSAGES/msg.po | 14 +++++++++----- locale/fr_FR/LC_MESSAGES/msg.po | 9 ++++++--- locale/it_IT/LC_MESSAGES/msg.po | 10 +++++++--- locale/pl_PL/LC_MESSAGES/msg.po | 9 ++++++--- locale/pt_BR/LC_MESSAGES/msg.po | 14 +++++++++----- locale/ru_RU/LC_MESSAGES/msg.po | 10 +++++++--- msg.pot | 4 ++-- 11 files changed, 72 insertions(+), 42 deletions(-) diffs (truncated from 381 to 300 lines): diff -r f14434f92b71 -r cc33975af1be downloads.php --- a/downloads.php Tue Jun 16 16:55:28 2009 +0200 +++ b/downloads.php Tue Jun 16 17:02:16 2009 +0200 @@ -78,7 +78,7 @@ print _(" PLD\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" Gajim is in the ac-main tree. So just ")."poldek -U gajim\n"; +print _(" Just ")."poldek -U gajim\n"; print ("<a name=\"sourcemage\">\n"); print (" <h2>\n"); diff -r f14434f92b71 -r cc33975af1be locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -423,9 +423,8 @@ #: downloads.php:81 #, fuzzy -msgid " Gajim is in the ac-main tree. So just " -msgstr "" -" Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " +msgid " Just " +msgstr " Само" #: downloads.php:85 msgid " SourceMage\n" @@ -945,6 +944,11 @@ msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" +#, fuzzy +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr "" +#~ " Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -441,8 +441,9 @@ msgstr " PLD\n" #: downloads.php:81 -msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim ist im AC Haupt-Stamm. Also einfach " +#, fuzzy +msgid " Just " +msgstr " Einfach" #: downloads.php:85 msgid " SourceMage\n" @@ -968,6 +969,9 @@ msgid "Here are some screenshots of Gajim:" msgstr "Hier sind einige Bildschirmfotos von Gajim:" +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr " Gajim ist im AC Haupt-Stamm. Also einfach " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/eo/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -179,9 +179,8 @@ msgstr " Deponejo" #: dev.php:27 -#, fuzzy msgid "To checkout hg do" -msgstr "Por ke elŝuti svn faru" +msgstr "Por ke elŝuti hg faru" #: dev.php:29 msgid " You can also" @@ -264,9 +263,8 @@ msgstr " Instalado\n" #: docs.php:17 -#, fuzzy msgid " Tarball and Mercurial\n" -msgstr " Tar-pakaĵo kaj Subversio\n" +msgstr " Tar-pakaĵo kaj Mercurial\n" #: docs.php:19 msgid "download" @@ -421,9 +419,8 @@ msgstr " PLD\n" #: downloads.php:81 -#, fuzzy -msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim estas disponebla en FreeBSD per FreeBSD portaĵoj. Simple " +msgid " Just " +msgstr " Simple " #: downloads.php:85 msgid " SourceMage\n" @@ -485,9 +482,8 @@ "elŝuti la subversian deponejon.\n" #: downloads.php:154 -#, fuzzy msgid " Mercurial\n" -msgstr " Strukturo\n" +msgstr " Mercurial\n" #: downloads.php:157 #, fuzzy @@ -934,6 +930,10 @@ msgid "Here are some screenshots of Gajim:" msgstr "Ĉi tie estas ekrankopioj de Gajim:" +#, fuzzy +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr " Gajim estas disponebla en FreeBSD per FreeBSD portaĵoj. Simple " + #~ msgid "Subversion" #~ msgstr "Subversio" diff -r f14434f92b71 -r cc33975af1be locale/es_ES/LC_MESSAGES/msg.po --- a/locale/es_ES/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/es_ES/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2005-06-01 19:05+0300\n" "Last-Translator: <membriskhan(a)gmail.com>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -426,10 +426,8 @@ #: downloads.php:81 #, fuzzy -msgid " Gajim is in the ac-main tree. So just " -msgstr "" -" Gajim está disponible en FreeBSD a través de los ports de FreeBSD. " -"Sólamente " +msgid " Just " +msgstr " Simplemente " #: downloads.php:85 msgid " SourceMage\n" @@ -945,6 +943,12 @@ msgid "Here are some screenshots of Gajim:" msgstr "Algunas capturas de pantalla de Gajim:" +#, fuzzy +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr "" +#~ " Gajim está disponible en FreeBSD a través de los ports de FreeBSD. " +#~ "Sólamente " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2005-08-18 13:21+0100\n" "Last-Translator: Yann Le Boulanger <asterix(a)lagaule.org>\n" "Language-Team: none\n" @@ -425,8 +425,8 @@ msgstr " PLD\n" #: downloads.php:81 -msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim est dans la branche ac-main. Donc tapez simplement " +msgid " Just " +msgstr " Lancez simplement " #: downloads.php:85 msgid " SourceMage\n" @@ -935,6 +935,9 @@ msgid "Here are some screenshots of Gajim:" msgstr "Voici quelques captures d'écran de Gajim :" +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr " Gajim est dans la branche ac-main. Donc tapez simplement " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/it_IT/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2007-09-23 00:39+0100\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian\n" @@ -426,8 +426,8 @@ #: downloads.php:81 #, fuzzy -msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim è disponibile per FreeBSD tramite i port FreeBSD. Basta " +msgid " Just " +msgstr " Basta" #: downloads.php:85 msgid " SourceMage\n" @@ -940,6 +940,10 @@ msgid "Here are some screenshots of Gajim:" msgstr "Ecco alcune schermate di Gajim:" +#, fuzzy +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr " Gajim è disponibile per FreeBSD tramite i port FreeBSD. Basta " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/pl_PL/LC_MESSAGES/msg.po --- a/locale/pl_PL/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/pl_PL/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Gajim-0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2008-10-19 20:18+0100\n" "Last-Translator: Tadzik Sośnierz <tadzikes(a)gmail.com>\n" "Language-Team: Polish\n" @@ -427,8 +427,8 @@ msgstr " PLD\n" #: downloads.php:81 -msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim znajduje się w repozytorium. Więc po prostu " +msgid " Just " +msgstr " Po prostu " #: downloads.php:85 msgid " SourceMage\n" @@ -943,6 +943,9 @@ msgid "Here are some screenshots of Gajim:" msgstr "Tutaj możesz zobaczyć zrzuty ekranu z Gajima:" +#~ msgid " Gajim is in the ac-main tree. So just " +#~ msgstr " Gajim znajduje się w repozytorium. Więc po prostu " + #~ msgid "Subversion" #~ msgstr "Subversion" diff -r f14434f92b71 -r cc33975af1be locale/pt_BR/LC_MESSAGES/msg.po --- a/locale/pt_BR/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 +++ b/locale/pt_BR/LC_MESSAGES/msg.po Tue Jun 16 17:02:16 2009 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-12 17:24+0200\n" +"POT-Creation-Date: 2009-06-16 16:59+0200\n" "PO-Revision-Date: 2009-03-11 10:53-0300\n" "Last-Translator: Davidson Paulo <davidsonpaulo(a)gmail.com>\n" "Language-Team: \n"

1 0

gajim-website: fix typo in polish translation of website
by Yann Leboulanger 16 Jun '09

16 Jun '09

changeset f14434f92b71 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=f14434f92b71 description: fix typo in polish translation of website diffstat: locale/pl_PL/LC_MESSAGES/msg.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 880a0bd337cb -r f14434f92b71 locale/pl_PL/LC_MESSAGES/msg.po --- a/locale/pl_PL/LC_MESSAGES/msg.po Fri Jun 12 18:21:26 2009 +0200 +++ b/locale/pl_PL/LC_MESSAGES/msg.po Tue Jun 16 16:55:28 2009 +0200 @@ -428,7 +428,7 @@ #: downloads.php:81 msgid " Gajim is in the ac-main tree. So just " -msgstr " Gajim znajduje się w repozytorium ac-main. Więc po prostu" +msgstr " Gajim znajduje się w repozytorium. Więc po prostu " #: downloads.php:85 msgid " SourceMage\n"

1 0

gajim: re-add removed function. Fixes #5093
by Yann Leboulanger 16 Jun '09

16 Jun '09

changeset a9e216d371b2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9e216d371b2 description: re-add removed function. Fixes #5093 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 8917cac6ca43 -r a9e216d371b2 src/roster_window.py --- a/src/roster_window.py Tue Jun 16 09:30:04 2009 +0200 +++ b/src/roster_window.py Tue Jun 16 15:14:09 2009 +0200 @@ -6065,6 +6065,9 @@ account, bookmark) gc_sub_menu.append(item) + def set_actions_menu_needs_rebuild(self): + self.actions_menu_needs_rebuild = True + def show_appropriate_context_menu(self, event, iters): # iters must be all of the same type model = self.modelfilter

1 0

gajim: fix missing import. Fixes #5092
by Yann Leboulanger 16 Jun '09

16 Jun '09

changeset 8917cac6ca43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8917cac6ca43 description: fix missing import. Fixes #5092 diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 231dad208eb1 -r 8917cac6ca43 src/gajim.py --- a/src/gajim.py Mon Jun 15 23:45:58 2009 +0200 +++ b/src/gajim.py Tue Jun 16 09:30:04 2009 +0200 @@ -36,6 +36,7 @@ ## import os +import sys import warnings if os.name == 'nt':

1 0

gajim: Update to latest rev of buildsys.
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset 0d4b26c00c1c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d4b26c00c1c description: Update to latest rev of buildsys. diffstat: buildsys.mk.in | 32 ++++++++++------ m4/buildsys.m4 | 95 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 88 insertions(+), 39 deletions(-) diffs (254 lines): diff -r 05572b4ad65a -r 0d4b26c00c1c buildsys.mk.in --- a/buildsys.mk.in Mon Jun 15 23:28:15 2009 +0200 +++ b/buildsys.mk.in Mon Jun 15 23:47:54 2009 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007 - 2008, Jonathan Schleifer <js-buildsys(a)webkeks.org> +# Copyright (c) 2007 - 2009, Jonathan Schleifer <js(a)webkeks.org> # # https://webkeks.org/hg/buildsys/ # @@ -38,8 +38,8 @@ ERLCFLAGS = @ERLCFLAGS@ OBJCFLAGS = @OBJCFLAGS@ LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ PYTHON_FLAGS = @PYTHON_FLAGS@ -LIBS = @LIBS@ PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@ PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@ PROG_SUFFIX = @EXEEXT@ @@ -52,12 +52,13 @@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ +RPATH_LDFLAGS = @RPATH_LDFLAGS@ INSTALL_LIB = @INSTALL_LIB@ UNINSTALL_LIB = @UNINSTALL_LIB@ CLEAN_LIB = @CLEAN_LIB@ LN_S = @LN_S@ MKDIR_P = mkdir -p -INSTALL = install +INSTALL = @INSTALL@ SHELL = @SHELL@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -150,12 +151,19 @@ fi ${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${OBJS} - ${LINK_STATUS} - if ${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ - ${LINK_OK}; \ - else \ - ${LINK_FAILED}; \ - fi + case $@ in \ + *.a) \ + ${MAKE} ${MFLAGS} STATIC_LIB=${LIB} LIB= $@ || exit 1 \ + ;; \ + *) \ + ${LINK_STATUS}; \ + if ${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi \ + ;; \ + esac ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} @@ -167,7 +175,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} - if ${AR} cr $@ ${OBJS} && ${RANLIB} ${@}; then \ + if ${AR} cr $@ ${OBJS} && ${RANLIB} $@; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \ @@ -397,7 +405,7 @@ ${MAKE} ${MFLAGS} clean || exit 1; \ ${DIR_LEAVE}; \ done - + for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} ${DEPS}; do \ if test -f $$i -o -d $$i; then \ if rm -fr $$i; then \ @@ -414,7 +422,7 @@ ${MAKE} ${MFLAGS} distclean || exit 1; \ ${DIR_LEAVE}; \ done - + for i in ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN} .deps *~; do \ if test -f $$i -o -d $$i; then \ if rm -fr $$i; then \ diff -r 05572b4ad65a -r 0d4b26c00c1c m4/buildsys.m4 --- a/m4/buildsys.m4 Mon Jun 15 23:28:15 2009 +0200 +++ b/m4/buildsys.m4 Mon Jun 15 23:47:54 2009 +0200 @@ -1,5 +1,5 @@ dnl -dnl Copyright (c) 2007 - 2008, Jonathan Schleifer <js-buildsys(a)webkeks.org> +dnl Copyright (c) 2007 - 2009, Jonathan Schleifer <js(a)webkeks.org> dnl dnl https://webkeks.org/hg/buildsys/ dnl @@ -20,9 +20,19 @@ dnl POSSIBILITY OF SUCH DAMAGE. dnl +AC_DEFUN([BUILDSYS_LIB], [ + AC_ARG_ENABLE(shared, + AS_HELP_STRING([--disable-shared], [don't build shared libraries])) + + AS_IF([test x"$enable_shared" = x"no"], + [BUILDSYS_STATIC_LIB_ONLY], + [BUILDSYS_SHARED_LIB]) +]) + AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(whether we need an implib) - case "$target" in + case "$host" in *-*-cygwin* | *-*-mingw*) AC_MSG_RESULT(yes) PROG_IMPLIB_NEEDED='yes' @@ -34,45 +44,31 @@ PROG_IMPLIB_LDFLAGS='' ;; esac - + AC_SUBST(PROG_IMPLIB_NEEDED) AC_SUBST(PROG_IMPLIB_LDFLAGS) ]) AC_DEFUN([BUILDSYS_SHARED_LIB], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_MSG_CHECKING(for shared library system) - case "$target" in - intel-apple-*) - AC_MSG_RESULT([Mac OS X (Intel)]) + case "$host" in + *-apple-*) + AC_MSG_RESULT(Mac OS X) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' - LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' + LIB_LDFLAGS='-dynamiclib -install_name ${libdir}/${LIB}' LIB_PREFIX='lib' LIB_SUFFIX='.dylib' - PLUGIN_CPPFLAGS='' - PLUGIN_CFLAGS='' - PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-bundle -flat_namespace -undefined suppress' PLUGIN_SUFFIX='.impl' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' CLEAN_LIB='' ;; - *-apple-*) - AC_MSG_RESULT(Mac OS X) - LIB_CPPFLAGS='-DPIC' - LIB_CFLAGS='' - LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' - LIB_PREFIX='lib' - LIB_SUFFIX='.dylib' - PLUGIN_CPPFLAGS='' - PLUGIN_CFLAGS='' - PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' - PLUGIN_SUFFIX='.impl' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' - CLEAN_LIB='' - ;; - *-*-solaris* | *-*-openbsd* | *-*-mirbsd*) + *-*-solaris*) AC_MSG_RESULT(Solaris) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' @@ -83,10 +79,27 @@ PLUGIN_CFLAGS='-fPIC' PLUGIN_LDFLAGS='-shared -fPIC' PLUGIN_SUFFIX='.so' + RPATH_LDFLAGS='-Wl,-rpath,${libdir}' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' CLEAN_LIB='' ;; + *-*-openbsd* | *-*-mirbsd*) + AC_MSG_RESULT(Solaris) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-shared -fPIC' + LIB_PREFIX='lib' + LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-shared -fPIC' + PLUGIN_SUFFIX='.so' + RPATH_LDFLAGS='-Wl,-rpath,${libdir}' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' + CLEAN_LIB='' + ;; *-*-cygwin* | *-*-mingw*) AC_MSG_RESULT(Win32) LIB_CPPFLAGS='-DPIC' @@ -98,7 +111,8 @@ PLUGIN_CFLAGS='' PLUGIN_LDFLAGS='-shared' PLUGIN_SUFFIX='.dll' - INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' + RPATH_LDFLAGS='-Wl,-rpath,${libdir}' + INSTALL_LIB='${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' CLEAN_LIB='${LIB}.a' ;; @@ -113,6 +127,7 @@ PLUGIN_CFLAGS='-fPIC' PLUGIN_LDFLAGS='-shared -fPIC' PLUGIN_SUFFIX='.so' + RPATH_LDFLAGS='-Wl,-rpath,${libdir}' INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' CLEAN_LIB='' @@ -128,6 +143,32 @@ AC_SUBST(PLUGIN_CFLAGS) AC_SUBST(PLUGIN_LDFLAGS) AC_SUBST(PLUGIN_SUFFIX) + AC_SUBST(RPATH_LDFLAGS) + AC_SUBST(INSTALL_LIB) + AC_SUBST(UNINSTALL_LIB) + AC_SUBST(CLEAN_LIB) +]) + +AC_DEFUN([BUILDSYS_STATIC_LIB_ONLY], [ + AC_REQUIRE([AC_PROG_RANLIB]) + AC_PATH_TOOL(AR, ar) + + LIB_CPPFLAGS='' + LIB_CFLAGS='' + LIB_LDFLAGS='' + LIB_PREFIX='lib' + LIB_SUFFIX='.a' + RPATH_LDFLAGS='' + INSTALL_LIB='${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i' + CLEAN_LIB='' + + AC_SUBST(LIB_CPPFLAGS) + AC_SUBST(LIB_CFLAGS) + AC_SUBST(LIB_LDFLAGS) + AC_SUBST(LIB_PREFIX) + AC_SUBST(LIB_SUFFIX) + AC_SUBST(RPATH_LDFLAGS) AC_SUBST(INSTALL_LIB) AC_SUBST(UNINSTALL_LIB) AC_SUBST(CLEAN_LIB)

1 0

gajim: Revert 8e07f3058cd9.
by Jonathan Schleifer 15 Jun '09

15 Jun '09

changeset 231dad208eb1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=231dad208eb1 description: Revert 8e07f3058cd9. It seems that hg purge works with .hgignore in newer hg versions. diffstat: .hgignore | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diffs (31 lines): diff -r 8e07f3058cd9 -r 231dad208eb1 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Mon Jun 15 23:45:58 2009 +0200 @@ -0,0 +1,27 @@ +syntax: glob +*.gmo +*.in +*.la +*.lo +*.m4 +*.pyc +*.pyo +*.o +*.Plo +*~ +autom4te.cache +data/defs.py +data/gajim.desktop +libtool +po/.intltool-merge-cache +po/POTFILES +po/stamp-it +stamp-h1 +Makefile + +syntax: regexp +^config\.* +^config\/ +^src\/\.libs +^src\/trayicon.c +^scripts\/gajim.*

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009