Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: merge
by Yann Leboulanger 10 Jun '09

10 Jun '09

changeset 5599d33ed39a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5599d33ed39a description: merge

1 0

gajim: no need of IF NOT EXISTS when creating the database
by Yann Leboulanger 10 Jun '09

10 Jun '09

changeset b0303720e4f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b0303720e4f8 description: no need of IF NOT EXISTS when creating the database X-Hg-Repo: gajim Subject: gajim: set iconset to DEFAULT_ICONSET when configured one doesn't exist. Fixes #5083 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 34447e04adef in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=34447e04adef description: set iconset to DEFAULT_ICONSET when configured one doesn't exist. Fixes #5083 diffstat: Makefile.am | 9 +-------- README.html | 3 +-- configure.ac | 22 ---------------------- data/Makefile.am | 8 +------- po/POTFILES.skip | 1 + src/adhoc_commands.py | 12 ++++++++---- src/chat_control.py | 9 +++++++-- src/common/GnuPG.py | 5 ++++- src/common/check_paths.py | 2 +- src/common/connection_handlers.py | 2 ++ src/common/zeroconf/client_zeroconf.py | 3 ++- src/disco.py | 8 +++++--- src/filetransfers_window.py | 2 +- src/gajim.py | 20 ++++++++++++++++---- src/groupchat_control.py | 8 ++++++++ src/gtkgui_helpers.py | 10 ++++++++-- src/history_manager.py | 29 +++++++++++++++++++++++++++-- src/vcard.py | 15 +++++++-------- 18 files changed, 100 insertions(+), 68 deletions(-) diffs (truncated from 454 to 300 lines): diff -r 6f6c0ac4236d -r 34447e04adef Makefile.am --- a/Makefile.am Wed May 20 10:58:46 2009 +0200 +++ b/Makefile.am Wed Jun 10 11:44:58 2009 +0200 @@ -2,14 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -if BUILD_REMOTE_CONTROL -OPTIONAL_BIN = scripts/gajim-remote -else -OPTIONAL_BIN = -endif - -bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN) - +bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote docfilesdir = $(docdir) docfiles_DATA = README \ diff -r 6f6c0ac4236d -r 34447e04adef README.html --- a/README.html Wed May 20 10:58:46 2009 +0200 +++ b/README.html Wed Jun 10 11:44:58 2009 +0200 @@ -37,7 +37,7 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> @@ -55,7 +55,6 @@ <li>python-gtk2-dev</li> <li>libgtk2.0-dev aka. gtk2-devel</li> <li>libgtkspell-dev (for the gtkspell module)</li> -<li>libdbus-1-dev (for the remote control module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 6f6c0ac4236d -r 34447e04adef configure.ac --- a/configure.ac Wed May 20 10:58:46 2009 +0200 +++ b/configure.ac Wed Jun 10 11:44:58 2009 +0200 @@ -45,27 +45,6 @@ PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFS) -dnl ***** -dnl dbus -dnl ***** -AC_ARG_ENABLE([remote], - [ --disable-remote disable remote control via DBus [default auto]], - enable_remote=$enableval, enable_remote=auto) - -if test "x$enable_remote" = "xauto"; then - PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no) -fi - -if test "x$enable_remote" = "xyes";then - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60]) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - have_remote=true -else - have_remote=false -fi -AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote) - AM_PATH_PYTHON([2.5]) if test "x$PYTHON" = "x:"; then AC_MSG_ERROR([Python not found]) @@ -184,7 +163,6 @@ echo " ***************************** Build features: - remote control ... ${have_remote} trayicon ......... ${have_trayicon} idle module OSX .. ${have_idle_osx} cocoa (OSX)....... ${have_cocoa} diff -r 6f6c0ac4236d -r 34447e04adef data/Makefile.am --- a/data/Makefile.am Wed May 20 10:58:46 2009 +0200 +++ b/data/Makefile.am Wed Jun 10 11:44:58 2009 +0200 @@ -14,13 +14,7 @@ otherdir = $(pkgdatadir)/data/other other_DATA = other/servers.xml other/cacerts.pem -if BUILD_REMOTE_CONTROL -OPTIONAL_MAN = gajim-remote.1 -else -OPTIONAL_MAN = -endif - -man_MANS = gajim.1 $(OPTIONAL_MAN) +man_MANS = gajim.1 gajim-remote.1 EXTRA_DIST = $(desktop_in_files) \ diff -r 6f6c0ac4236d -r 34447e04adef po/POTFILES.skip --- a/po/POTFILES.skip Wed May 20 10:58:46 2009 +0200 +++ b/po/POTFILES.skip Wed Jun 10 11:44:58 2009 +0200 @@ -1,2 +1,3 @@ data/gajim.desktop.in src/eggtrayicon.c +src/ipython_view.py diff -r 6f6c0ac4236d -r 34447e04adef src/adhoc_commands.py --- a/src/adhoc_commands.py Wed May 20 10:58:46 2009 +0200 +++ b/src/adhoc_commands.py Wed Jun 10 11:44:58 2009 +0200 @@ -44,7 +44,7 @@ TODO: gtk 2.10 has a special wizard-widget, consider using it...''' - def __init__(self, account, jid): + def __init__(self, account, jid, commandnode=None): '''Create new window.''' # an account object @@ -55,7 +55,7 @@ self.commandlist=None # a list of (commandname, commanddescription) # command's data - self.commandnode = None + self.commandnode = commandnode self.sessionid = None self.dataform = None self.allow_stage3_close = False @@ -78,8 +78,12 @@ self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget) - # setting initial stage - self.stage1() + if self.commandnode: + # Execute command + self.stage3() + else: + # setting initial stage + self.stage1() # displaying the window self.xml.signal_autoconnect(self) diff -r 6f6c0ac4236d -r 34447e04adef src/chat_control.py --- a/src/chat_control.py Wed May 20 10:58:46 2009 +0200 +++ b/src/chat_control.py Wed Jun 10 11:44:58 2009 +0200 @@ -1022,7 +1022,11 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session and self.session.remove_events(types_list): + if self.type_id == message_control.TYPE_GC: + if not gajim.events.remove_events(self.account, jid, + types=types_list): + self.redraw_after_event_removed(jid) + elif self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid) @@ -2497,8 +2501,9 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: + import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % constants.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r 6f6c0ac4236d -r 34447e04adef src/common/GnuPG.py --- a/src/common/GnuPG.py Wed May 20 10:58:46 2009 +0200 +++ b/src/common/GnuPG.py Wed Jun 10 11:44:58 2009 +0200 @@ -194,6 +194,9 @@ output = proc.handles['stdout'].read() proc.handles['stdout'].close() + try: proc.wait() + except IOError: pass + keys = {} lines = output.split('\n') for line in lines: @@ -234,4 +237,4 @@ out = out + "-----END PGP %s-----\n" % type_ return out -# vim: se ts=3: +# vim: set ts=3: diff -r 6f6c0ac4236d -r 34447e04adef src/common/check_paths.py --- a/src/common/check_paths.py Wed May 20 10:58:46 2009 +0200 +++ b/src/common/check_paths.py Wed Jun 10 11:44:58 2009 +0200 @@ -92,7 +92,7 @@ hash TEXT, data BLOB); - CREATE TABLE IF NOT EXISTS rooms_last_message_time( + CREATE TABLE rooms_last_message_time( jid_id INTEGER PRIMARY KEY UNIQUE, time INTEGER ); diff -r 6f6c0ac4236d -r 34447e04adef src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed May 20 10:58:46 2009 +0200 +++ b/src/common/connection_handlers.py Wed Jun 10 11:44:58 2009 +0200 @@ -829,6 +829,8 @@ def _DiscoverInfoCB(self, con, iq_obj): log.debug('DiscoverInfoCB') + if not self.connection or self.connected < 2: + return # According to XEP-0030: # For identity: category, type is mandatory, name is optional. # For feature: var is mandatory diff -r 6f6c0ac4236d -r 34447e04adef src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Wed May 20 10:58:46 2009 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Wed Jun 10 11:44:58 2009 +0200 @@ -96,8 +96,9 @@ break P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid) - def disconnect(self): + def disconnect(self, message=''): ''' free all resources, we are not listening anymore ''' + log.info('Disconnecting ZeroconfListener: %s' % message) gajim.idlequeue.remove_timeout(self.fd) gajim.idlequeue.unplug_idle(self.fd) self.fd = -1 diff -r 6f6c0ac4236d -r 34447e04adef src/disco.py --- a/src/disco.py Wed May 20 10:58:46 2009 +0200 +++ b/src/disco.py Wed Jun 10 11:44:58 2009 +0200 @@ -1241,7 +1241,8 @@ return service = model[iter_][0].decode('utf-8') if service in gajim.interface.instances[self.account]['search']: - gajim.interface.instances[self.account]['search'][service].present() + gajim.interface.instances[self.account]['search'][service].window.\ + present() else: gajim.interface.instances[self.account]['search'][service] = \ search_window.SearchWindow(self.account, service) @@ -1257,14 +1258,15 @@ self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget = None): + def on_execute_button_clicked(self, widget=None): '''When we want to execute a command: open adhoc command window''' model, iter_ = self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) + node = model[iter_][1].decode('utf-8') + adhoc_commands.CommandWindow(self.account, service, commandnode=node) def on_register_button_clicked(self, widget = None): '''When we want to register an agent: diff -r 6f6c0ac4236d -r 34447e04adef src/filetransfers_window.py --- a/src/filetransfers_window.py Wed May 20 10:58:46 2009 +0200 +++ b/src/filetransfers_window.py Wed Jun 10 11:44:58 2009 +0200 @@ -589,7 +589,7 @@ return file_props['elapsed-time'] = 0 self.files_props[file_props['type']][file_props['sid']] = file_props - iter_ = self.model.append() + iter_ = self.model.prepend() text_labels = '' + _('Name: ') + '\n' if file_props['type'] == 'r': text_labels += '' + _('Sender: ') + '' diff -r 6f6c0ac4236d -r 34447e04adef src/gajim.py --- a/src/gajim.py Wed May 20 10:58:46 2009 +0200 +++ b/src/gajim.py Wed Jun 10 11:44:58 2009 +0200 @@ -3091,18 +3091,30 @@ typ = 'png' extension = '.png' path_to_original_file = path_to_file + extension - pixbuf.save(path_to_original_file, typ) + try: + pixbuf.save(path_to_original_file, typ) + except Exception, e: + log.error('Error writing avatar file %s: %s' % (path_to_original_file, + str(e))) # Generate and save the resized, color avatar pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'notification') if pixbuf: path_to_normal_file = path_to_file + '_notif_size_colored' + extension - pixbuf.save(path_to_normal_file, 'png') + try: + pixbuf.save(path_to_normal_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e))) # Generate and save the resized, black and white avatar bwbuf = gtkgui_helpers.get_scaled_pixbuf( gtkgui_helpers.make_pixbuf_grayscale(pixbuf), 'notification') if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension - bwbuf.save(path_to_bw_file, 'png') + try: + bwbuf.save(path_to_bw_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e)))

1 0

gajim: we always build gajim-remote, so always built manpage for...
by Yann Leboulanger 10 Jun '09

10 Jun '09

changeset 53cda0708bfd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53cda0708bfd description: we always build gajim-remote, so always built manpage for gajim-remote diffstat: data/Makefile.am | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diffs (18 lines): diff -r 0db88ecaf31c -r 53cda0708bfd data/Makefile.am --- a/data/Makefile.am Wed Jun 10 09:33:21 2009 +0200 +++ b/data/Makefile.am Wed Jun 10 09:47:06 2009 +0200 @@ -14,13 +14,7 @@ otherdir = $(pkgdatadir)/data/other other_DATA = other/servers.xml other/cacerts.pem -if BUILD_REMOTE_CONTROL -OPTIONAL_MAN = gajim-remote.1 -else -OPTIONAL_MAN = -endif - -man_MANS = gajim.1 $(OPTIONAL_MAN) +man_MANS = gajim.1 gajim-remote.1 EXTRA_DIST = $(desktop_in_files) \

1 0

gajim: don't translate ipython_view.py. It's only for developers...
by Yann Leboulanger 10 Jun '09

10 Jun '09

changeset 0db88ecaf31c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0db88ecaf31c description: don't translate ipython_view.py. It's only for developers. Fixes #4613 diffstat: po/POTFILES.skip | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (7 lines): diff -r ac60d4be68b7 -r 0db88ecaf31c po/POTFILES.skip --- a/po/POTFILES.skip Sun Jun 07 20:59:04 2009 +0200 +++ b/po/POTFILES.skip Wed Jun 10 09:33:21 2009 +0200 @@ -1,2 +1,3 @@ data/gajim.desktop.in src/eggtrayicon.c +src/ipython_view.py

1 0

gajim: Merge default branch into osx_newbuildsys.
by Jonathan Schleifer 08 Jun '09

08 Jun '09

changeset 14b5b54a7dbf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=14b5b54a7dbf description: Merge default branch into osx_newbuildsys. diffstat: README.html | 3 +-- configure.ac | 22 ---------------------- src/chat_control.py | 3 ++- src/filetransfers_window.py | 2 +- 4 files changed, 4 insertions(+), 26 deletions(-) diffs (85 lines): diff -r 7de5f685aca6 -r 14b5b54a7dbf README.html --- a/README.html Fri Jun 05 22:07:58 2009 +0200 +++ b/README.html Mon Jun 08 17:29:28 2009 +0200 @@ -37,7 +37,7 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> @@ -55,7 +55,6 @@ <li>python-gtk2-dev</li> <li>libgtk2.0-dev aka. gtk2-devel</li> <li>libgtkspell-dev (for the gtkspell module)</li> -<li>libdbus-1-dev (for the remote control module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 7de5f685aca6 -r 14b5b54a7dbf configure.ac --- a/configure.ac Fri Jun 05 22:07:58 2009 +0200 +++ b/configure.ac Mon Jun 08 17:29:28 2009 +0200 @@ -39,27 +39,6 @@ PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFS) -dnl ***** -dnl dbus -dnl ***** -AC_ARG_ENABLE([remote], - [ --disable-remote disable remote control via DBus [default auto]], - enable_remote=$enableval, enable_remote=auto) - -if test "x$enable_remote" = "xauto"; then - PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no) -fi - -if test "x$enable_remote" = "xyes";then - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60]) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - have_remote=true -else - have_remote=false -fi -AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote) - AM_PATH_PYTHON([2.5]) if test "x$PYTHON" = "x:"; then AC_MSG_ERROR([Python not found]) @@ -161,7 +140,6 @@ echo " ***************************** Build features: - remote control ... ${have_remote} trayicon ......... ${have_trayicon} idle module OSX .. ${have_idle_osx} cocoa (OSX)....... ${have_cocoa} diff -r 7de5f685aca6 -r 14b5b54a7dbf src/chat_control.py --- a/src/chat_control.py Fri Jun 05 22:07:58 2009 +0200 +++ b/src/chat_control.py Mon Jun 08 17:29:28 2009 +0200 @@ -2501,8 +2501,9 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: + import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % constants.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message diff -r 7de5f685aca6 -r 14b5b54a7dbf src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Jun 05 22:07:58 2009 +0200 +++ b/src/filetransfers_window.py Mon Jun 08 17:29:28 2009 +0200 @@ -589,7 +589,7 @@ return file_props['elapsed-time'] = 0 self.files_props[file_props['type']][file_props['sid']] = file_props - iter_ = self.model.append() + iter_ = self.model.prepend() text_labels = '' + _('Name: ') + '\n' if file_props['type'] == 'r': text_labels += '' + _('Sender: ') + ''

1 0

gajim: fix missing import in trunk. Fixes #5078
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset ac60d4be68b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac60d4be68b7 description: fix missing import in trunk. Fixes #5078 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 97d46f489a69 -r ac60d4be68b7 src/chat_control.py --- a/src/chat_control.py Sun Jun 07 20:46:39 2009 +0200 +++ b/src/chat_control.py Sun Jun 07 20:59:04 2009 +0200 @@ -2501,8 +2501,9 @@ rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, pending_how_many, timeout, self.account) except exceptions.DatabaseMalformed: + import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % constants.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message

1 0

gajim: don't require libdbus-1-dev to have gajim-remote. All dis...
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 97d46f489a69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=97d46f489a69 description: don't require libdbus-1-dev to have gajim-remote. All distribution have libdbus > 0.60 now. Fizes #2992 diffstat: Makefile.am | 9 +-------- README.html | 3 +-- configure.ac | 22 ---------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diffs (78 lines): diff -r 7bfcc5454643 -r 97d46f489a69 Makefile.am --- a/Makefile.am Sat Jun 06 19:05:49 2009 +0200 +++ b/Makefile.am Sun Jun 07 20:46:39 2009 +0200 @@ -2,14 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 -if BUILD_REMOTE_CONTROL -OPTIONAL_BIN = scripts/gajim-remote -else -OPTIONAL_BIN = -endif - -bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager $(OPTIONAL_BIN) - +bin_SCRIPTS = scripts/gajim scripts/gajim-history-manager scripts/gajim-remote docfilesdir = $(docdir) docfiles_DATA = README \ diff -r 7bfcc5454643 -r 97d46f489a69 README.html --- a/README.html Sat Jun 06 19:05:49 2009 +0200 +++ b/README.html Sun Jun 07 20:46:39 2009 +0200 @@ -37,7 +37,7 @@ <li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim.</li> +<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.60 is required.</li> <li>python-dbus bindings</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> @@ -55,7 +55,6 @@ <li>python-gtk2-dev</li> <li>libgtk2.0-dev aka. gtk2-devel</li> <li>libgtkspell-dev (for the gtkspell module)</li> -<li>libdbus-1-dev (for the remote control module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 7bfcc5454643 -r 97d46f489a69 configure.ac --- a/configure.ac Sat Jun 06 19:05:49 2009 +0200 +++ b/configure.ac Sun Jun 07 20:46:39 2009 +0200 @@ -45,27 +45,6 @@ PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFS) -dnl ***** -dnl dbus -dnl ***** -AC_ARG_ENABLE([remote], - [ --disable-remote disable remote control via DBus [default auto]], - enable_remote=$enableval, enable_remote=auto) - -if test "x$enable_remote" = "xauto"; then - PKG_CHECK_EXISTS([dbus-1],enable_remote=yes,enable_remote=no) -fi - -if test "x$enable_remote" = "xyes";then - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.60]) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - have_remote=true -else - have_remote=false -fi -AM_CONDITIONAL(BUILD_REMOTE_CONTROL, $have_remote) - AM_PATH_PYTHON([2.5]) if test "x$PYTHON" = "x:"; then AC_MSG_ERROR([Python not found]) @@ -184,7 +163,6 @@ echo " ***************************** Build features: - remote control ... ${have_remote} trayicon ......... ${have_trayicon} idle module OSX .. ${have_idle_osx} cocoa (OSX)....... ${have_cocoa}

1 0

gajim-website: latest release is now 0.12.2
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 790536b9a010 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=790536b9a010 description: latest release is now 0.12.2 diffstat: downloads.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 2fc685450aa0 -r 790536b9a010 downloads.php --- a/downloads.php Sun Jun 07 19:41:05 2009 +0200 +++ b/downloads.php Sun Jun 07 19:50:33 2009 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); print (" \n"); -print _(" Latest version of Gajim is")." 0.12.1 \n"; +print _(" Latest version of Gajim is")." 0.12.2 \n"; //printf(_(" A %s version is in test"), "0.12-beta"); //print (" \n"); print _("If your distribution doesn't have the latest version "); @@ -131,7 +131,7 @@ print _(" Windows installer\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" There is a ")." <a href=\"downloads/gajim-0.12.1-1.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/gajim-0.12.2-1.exe\">"._("Gajim installer")."</a>.\n"; print (" \n"); //print _(" Here is a")." <a href=\"downloads/gajim-0.12-beta1.exe\">"._("Gajim installer")."</a> "._("for 0.12-beta 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"; @@ -143,7 +143,7 @@ print _(" Source\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.12.1.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/tags/gajim-0.12.1/README.html?format=raw\">see the <tt>README</tt></a> ("._("in English")."). \n"; +print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.12.2.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/README.html?rev=10652%3A8af9d0f68948\">see the <tt>README</tt></a> ("._("in English")."). \n"; //print _(" The tarball version of 0.12 beta-release is ")."<a href=\"downloads/gajim-0.12-beta1.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n");

1 0

gajim: Added tag gajim-0.12.2 for changeset 8af9d0f68948
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 35e9da5fd69a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35e9da5fd69a description: Added tag gajim-0.12.2 for changeset 8af9d0f68948 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (6 lines): diff -r 8af9d0f68948 -r 35e9da5fd69a .hgtags --- a/.hgtags Sun Jun 07 18:03:30 2009 +0200 +++ b/.hgtags Sun Jun 07 19:47:06 2009 +0200 @@ -1,1 +1,2 @@ 22273fe2d51e4b7a942fb33b2fd81cdea9ace4aa gajim-0.11.4 +8af9d0f68948a30226eb1473cd99d87d15386d01 gajim-0.12.2

1 0

gajim-website: update french translation
by Yann Leboulanger 07 Jun '09

07 Jun '09

changeset 2fc685450aa0 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=2fc685450aa0 description: update french translation diffstat: locale/bg_BG/LC_MESSAGES/msg.po | 367 +++++++++++++---------- locale/de_DE/LC_MESSAGES/msg.po | 436 +++++++++++++++------------- locale/eo/LC_MESSAGES/msg.po | 368 +++++++++++++---------- locale/es_ES/LC_MESSAGES/msg.po | 373 +++++++++++++----------- locale/fr_FR/LC_MESSAGES/msg.po | 407 ++++++++++++++------------ locale/it_IT/LC_MESSAGES/msg.po | 368 +++++++++++++---------- locale/pl_PL/LC_MESSAGES/msg.po | 363 +++++++++++++---------- locale/pt_BR/LC_MESSAGES/msg.po | 663 +++++++++++++++++++++++++++++--------------- locale/ru_RU/LC_MESSAGES/msg.po | 376 +++++++++++++----------- msg.pot | 250 ++++++--------- 10 files changed, 2221 insertions(+), 1750 deletions(-) diffs (truncated from 7093 to 300 lines): diff -r 8acbea248bda -r 2fc685450aa0 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Sun Jun 07 19:22:18 2009 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sun Jun 07 19:41:05 2009 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-21 14:51+0100\n" +"POT-Creation-Date: 2009-06-07 19:28+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" @@ -102,8 +102,8 @@ msgstr "Изходен код" #: Design.php:109 -msgid "Subversion" -msgstr "Subversion" +msgid "Mercurial" +msgstr "" #: Design.php:110 msgid "Daily snapshots" @@ -129,7 +129,7 @@ msgid " Language:" msgstr " Език:" -#: Design.php:177 +#: Design.php:178 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -169,9 +169,8 @@ msgid " List archives are available " msgstr " Архивите на списъка са достъпни " -#: dev.php:20 docs.php:51 docs.php:54 docs.php:57 docs.php:60 docs.php:72 -#: docs.php:78 downloads.php:146 downloads.php:157 downloads.php:195 -#: downloads.php:217 index.php:14 +#: dev.php:20 docs.php:39 docs.php:45 downloads.php:146 downloads.php:157 +#: downloads.php:195 downloads.php:217 msgid "here" msgstr "тук" @@ -180,7 +179,8 @@ msgstr " Хранилище" #: dev.php:27 -msgid "To checkout svn do" +#, fuzzy +msgid "To checkout hg do" msgstr "За да изтеглите работно копие от хранилището, напишете" #: dev.php:29 @@ -264,7 +264,8 @@ msgstr " Инсталация\n" #: docs.php:17 -msgid " Tarball and Subversion\n" +#, fuzzy +msgid " Tarball and Mercurial\n" msgstr " Архив и версия от Subversion\n" #: docs.php:19 @@ -281,135 +282,52 @@ msgstr " Под GNU/Линукс\n" #: docs.php:24 -msgid "" -" To run this version, you have to install some packages: python2.3 " -"python2.3-gtk2 and python2.3-glade2.\n" +#, fuzzy +msgid " To run this version, you have to install some packages. \n" msgstr "" " За да използвате тази версия, трябва да инсталирате някои пакети: " "python2.3, python2.3-gtk2 и python2.3-glade2.\n" #: docs.php:25 -msgid " (With Debian, just run:" -msgstr " (За Дебиан, просто изпълнете:" +msgid "README file" +msgstr "" #: docs.php:26 -msgid " Note that python2.4 can be used instead of python2.3.\n" -msgstr " Може да се използва и python2.4 вместо python2.3.\n" +#, fuzzy, c-format +msgid " See %s.\n" +msgstr " Subversion\n" #: docs.php:29 -msgid "" -" To use the idle module, the trayicon one and the gtkspell one, you have " -"to compile them. For idle you may need libxss-dev (if you don't have " -"scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, " -"if you have gnome-python-extras." -msgstr "" -" За да използвате модулите за автоматична промяна на състоянието, икона " -"в областта за уведомяване и gtkspell, трябва да ги компилирате. За модула за " -"състоянието е необходим libxss-dev (ако нямате scrnsaver.h), а за иконата и " -"gtkspell може да избегнете компилация, ако имате gnome-python-extras." - -#: docs.php:31 -msgid " In order to compile them all type" -msgstr " За да ги компилирате всички, напишете" - -#: docs.php:31 -msgid "" -"in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and " -"libgtk2.0-dev packages are needed)\n" -msgstr "" -"в директорията на gajim. (трябва да имате пакетите python-dev, python-gtk2-" -"dev, libgtkspell-dev и libgtk2.0-dev)\n" - -#: docs.php:34 -msgid " You can install or run from source. To run from source" -msgstr "" -" Може да инсталирате и изпълнявате от изходен код. За да изпълните от " -"изходния код, напишете" - -#: docs.php:35 -msgid "in the gajim folder." -msgstr "в директорията на gajim." - -#: docs.php:37 -msgid " To install " -msgstr " За да инсталирате, изпълнете " - -#: docs.php:37 -msgid "in the gajim folder" -msgstr "в директорията на gajim" - -#: docs.php:38 -msgid " and then you just have to run" -msgstr " и после просто трябва да напишете" - -#: docs.php:38 -msgid "in order to use Gajim.\n" -msgstr "за да го използвате.\n" - -#: docs.php:41 msgid " Under Microsoft Windows\n" msgstr " Под „Майкрософт Уиндоус“\n" -#: docs.php:47 -#, fuzzy, c-format -msgid " In a first time, you have to install %s, %s, %s and %s.\n" -msgstr " Като начало, трябва да инсталирате" +#: docs.php:31 +#, fuzzy +msgid "this page" +msgstr "уики-страници" -#: docs.php:51 -msgid " To get python, download the latest version" -msgstr " За python, изтеглете последната версия" +#: docs.php:32 +#, c-format +msgid "See %s to install development versio under windows." +msgstr "" -#: docs.php:51 -msgid "(Gajim works with python-2.4.x)" -msgstr "(Gajim работи с python-2.4.x)" - -#: docs.php:51 docs.php:54 -msgid "and install it.\n" -msgstr "и я инсталирайте.\n" - -#: docs.php:54 -msgid "" -" To get GTK+, download the latest version of the \"Runtime Environment" -"\"" -msgstr " За GTK+, изтеглете последната версия на „Runtime Environment“" - -#: docs.php:57 -msgid " To get pygtk, download latest version " -msgstr " За pygtk, изтеглете последната версия " - -#: docs.php:57 docs.php:60 -msgid " and install it.\n" -msgstr " и я инсталирайте.\n" - -#: docs.php:60 -msgid " At last, to get pywin32, download latest version " -msgstr " Накрая, за pywin32, изтеглете последната версия " - -#: docs.php:64 -msgid "download Gajim" -msgstr "да изтеглите Gajim" - -#: docs.php:65 -#, fuzzy, c-format -msgid " You can now %s and double click on gajim.py in src folder.\n" -msgstr "и да натиснете два пъти gajim.py в директорията src.\n" - -#: docs.php:72 +#: docs.php:39 msgid " Please read" msgstr " Моля, прочетете" -#: docs.php:76 +#: docs.php:43 msgid " Structure\n" msgstr " Структура\n" -#: docs.php:78 +#: docs.php:45 msgid " You can understand how Gajim works" msgstr " Може да разберете как работи Gajim" -#: docs.php:81 +#: docs.php:48 #, fuzzy, c-format msgid "" -" Gajim uses the %s library to do the interface with Jabber network.\n" +" Gajim uses a fork of the %s library to do the interface with Jabber " +"network.\n" msgstr "за интерфейс към мрежата Джабър.\n" #: downloads.php:8 @@ -437,7 +355,9 @@ msgstr " Ако използвате Дебиан „unstable“, напишете" #: downloads.php:21 -msgid " A daily package from svn is also built. To use it, remove gajim" +#, fuzzy +msgid "" +" A daily package from mercurial is also built. To use it, remove gajim" msgstr "" " Всеки ден се компилира пакет от хранилището на svn. За да го " "използвате, премахнете gajim" @@ -559,19 +479,22 @@ msgstr "на английски език" #: downloads.php:148 +#, fuzzy msgid "" "If you want to use the last unstable development version, then you should " -"checkout the subversion repository.\n" +"checkout the mercurial repository.\n" msgstr "" "Ако искате да ползвате последната нестабилна версия, все още в процес на " "разработка, то изтеглете работно копие на хранилището на subversion.\n" #: downloads.php:154 -msgid " Subversion\n" -msgstr " Subversion\n" +#, fuzzy +msgid " Mercurial\n" +msgstr " Структура\n" #: downloads.php:157 -msgid " The subversion server is available at this address: " +#, fuzzy +msgid " The mercurial repository is available at this address: " msgstr " Сървърът на subversion е достъпен на този адрес: " #: downloads.php:157 @@ -585,8 +508,9 @@ "стъпки:\n" #: downloads.php:163 +#, fuzzy msgid "" -" You first have to install subversion (apt-get install subversion " +" You first have to install mercurial (apt-get install mercurial " "under Debian)\n" msgstr "" " Да инсталирате subversion (apt-get install subversion под " @@ -617,9 +541,10 @@ msgstr "и после" #: downloads.php:184 +#, fuzzy msgid "" " Once you have the repository, you can update it periodicaly so it matches " -"the latest version from the server with the following command:\n" +"the latest version from the main repository with the following command:\n" msgstr "" " След като имате хранилището, може да го обновявате периодично спрямо " "последната версия от сървъра на Subversion чрез тази команда:\n" @@ -671,8 +596,8 @@ #: downloads.php:209 #, fuzzy msgid "" -" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from svn. You " -"can use them if svn is broken for you at the moment." +" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from mercurial. " +"You can use them if svn is broken for you at the moment." msgstr "" " Всеки ден в 01:00 часа (GMT+1) автоматично се генерират архиви от " "хранилището във формат bz2. Може да ги използвате, ако хранилището на SVN е " @@ -695,11 +620,12 @@ msgstr "Здравейте и добре дошли на уеб-страницата на проекта Gajim" #: index.php:14 +#, fuzzy msgid "" "The goal of Gajim is to provide a full featured and easy to use Jabber "

1 0

← Newer
1
...
6
7
8
9
10
11
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