Commits April 2017

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][master] 2 commits: fix "Unable to load icon gajim" errors caused by !84
by Philipp Hörist 22 Apr '17

22 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7e4b2571 by André Apitzsch at 2017-04-23T00:30:19+02:00 fix "Unable to load icon gajim" errors caused by !84 - - - - - 575afb08 by Philipp Hörist at 2017-04-23T01:01:29+02:00 Merge branch 'fixGetIcon' into 'master' fix "Unable to load icon gajim" errors caused by !84 See merge request !87 - - - - - 5 changed files: - src/config.py - src/dialogs.py - src/gui_interface.py - src/history_manager.py - src/notify.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -3686,7 +3686,7 @@ class AccountCreationWizardWindow: if self.modify: img.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) else: - path_to_file = gtkgui_helpers.get_icon_path('gajim', 48) + path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) img.set_from_file(path_to_file) self.show_vcard_checkbutton.set_active(not self.modify) self.notebook.set_current_page(6) # show finish page ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1339,7 +1339,7 @@ class AboutDialog(Gtk.AboutDialog): self.props.wrap_license = True - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128) + pixbuf = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128) self.set_logo(pixbuf) #here you write your name in the form Name FamilyName <someone@somewhere> ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2352,7 +2352,7 @@ class Interface: status = status + '.png' elif status == 'online': prefix = '' - status = gtkgui_helpers.get_icon_path('gajim', 32) + status = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 32) path = os.path.join(prefix, status) try: obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') @@ -3040,7 +3040,7 @@ class Interface: pixs = [] for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('gajim', size) + pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) if pix: pixs.append(pix) if pixs: ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -94,7 +94,7 @@ class HistoryManager: def __init__(self): pixs = [] for size in (16, 32, 48, 64, 128): - pix = gtkgui_helpers.get_icon_pixmap('gajim', size) + pix = gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', size) if pix: pixs.append(pix) if pixs: ===================================== src/notify.py ===================================== --- a/src/notify.py +++ b/src/notify.py @@ -321,7 +321,7 @@ class DesktopNotification: notification_text = ('<html><img src="%(image)s" align=left />' \ '%(title)s<br/>%(text)s</html>') % {'title': self.title, 'text': self.text, 'image': self.path_to_image} - gajim_icon = gtkgui_helpers.get_icon_path('gajim', 48) + gajim_icon = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) try: self.notif.Notify( dbus.String(_('Gajim')), # app_name (string) @@ -391,7 +391,7 @@ class DesktopNotification: '<td>%s</td></tr></table>' % (self.path_to_image, text) self.path_to_image = os.path.abspath( - gtkgui_helpers.get_icon_path('gajim', 48)) + gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48)) actions = () if 'actions' in self.capabilities and self.msg_type: actions = (dbus.String('default'), dbus.String( View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/25f403863efd3bff9fb42cbf7da2048d0…

1 0

[Git][gajim/gajim][master] 2 commits: use 'reverse DNS' convention for desktop and icon files
by Yann Leboulanger 22 Apr '17

22 Apr '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 15d83402 by André Apitzsch at 2017-04-18T21:19:15+02:00 use 'reverse DNS' convention for desktop and icon files see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s02.ht… - - - - - 25f40386 by Yann Leboulanger at 2017-04-22T17:26:57+02:00 Merge branch 'reverseDNS' into 'master' use 'reverse DNS' convention for desktop and icon files See merge request !84 - - - - - 9 changed files: - .gitignore - autogen.sh - configure.ac - data/Makefile.am - data/gajim.desktop.in.in → data/org.gajim.Gajim.desktop.in.in - icons/Makefile.am - icons/hicolor/128x128/apps/gajim.png → icons/hicolor/128x128/apps/org.gajim.Gajim.png - icons/hicolor/64x64/apps/gajim.png → icons/hicolor/64x64/apps/org.gajim.Gajim.png - icons/hicolor/scalable/apps/gajim.svg → icons/hicolor/scalable/apps/org.gajim.Gajim.svg Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ syntax: glob *~ autom4te.cache data/defs.py -data/gajim.desktop +data/org.gajim.Gajim.desktop libtool po/.intltool-merge-cache po/POTFILES ===================================== autogen.sh ===================================== --- a/autogen.sh +++ b/autogen.sh @@ -5,10 +5,10 @@ echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ - && ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \ + && ls -1 data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \ src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip fi ===================================== configure.ac ===================================== --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_CONFIG_FILES([ data/moods/Makefile data/activities/Makefile icons/Makefile - data/gajim.desktop.in + data/org.gajim.Gajim.desktop.in data/gajim-remote.desktop.in data/defs.py src/Makefile ===================================== data/Makefile.am ===================================== --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = gui emoticons pixmaps iconsets moods activities @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in +desktop_in_files = org.gajim.Gajim.desktop.in.in gajim-remote.desktop.in.in desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) installdefsdir = $(gajim_srcdir)/common @@ -29,6 +29,6 @@ EXTRA_DIST = $(desktop_in_files) \ DISTCLEANFILES = $(desktop_DATA) \ $(installdefs_DATA) -CLEANFILES = gajim.desktop gajim-remote.desktop +CLEANFILES = org.gajim.Gajim.desktop gajim-remote.desktop MAINTAINERCLEANFILES = Makefile.in ===================================== data/gajim.desktop.in.in → data/org.gajim.Gajim.desktop.in.in ===================================== --- a/data/gajim.desktop.in.in +++ b/data/org.gajim.Gajim.desktop.in.in @@ -6,7 +6,7 @@ _Comment=A GTK+ Jabber client _Keywords=chat;messaging;im;xmpp;bonjour;voip; Version=1.0 Exec=gajim -Icon=gajim +Icon=org.gajim.Gajim StartupNotify=true StartupWMClass=Gajim Terminal=false ===================================== icons/Makefile.am ===================================== --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -2,6 +2,6 @@ iconsdir = $(pkgdatadir)/icons nobase_dist_icons_DATA = $(srcdir)/*/*/*/* systemiconsdir = $(datadir)/icons -nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/gajim.* +nobase_dist_systemicons_DATA = $(srcdir)/*/*/*/org.gajim.Gajim.* MAINTAINERCLEANFILES = Makefile.in ===================================== icons/hicolor/128x128/apps/gajim.png → icons/hicolor/128x128/apps/org.gajim.Gajim.png ===================================== Binary files a/icons/hicolor/128x128/apps/gajim.png and b/icons/hicolor/128x128/apps/org.gajim.Gajim.png differ ===================================== icons/hicolor/64x64/apps/gajim.png → icons/hicolor/64x64/apps/org.gajim.Gajim.png ===================================== Binary files a/icons/hicolor/64x64/apps/gajim.png and b/icons/hicolor/64x64/apps/org.gajim.Gajim.png differ ===================================== icons/hicolor/scalable/apps/gajim.svg → icons/hicolor/scalable/apps/org.gajim.Gajim.svg ===================================== --- a/icons/hicolor/scalable/apps/gajim.svg +++ b/icons/hicolor/scalable/apps/org.gajim.Gajim.svg View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0b0812bb757b37eb3f5a10c70185602b1…

1 0

[Git][gajim/gajim][master] Start HistoryManager with config path argument
by Philipp Hörist 21 Apr '17

21 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b0812bb by Philipp Hörist at 2017-04-21T18:44:27+02:00 Start HistoryManager with config path argument HistoryManager was not finding the Logs.db when Gajim was used with the -c config path argument - - - - - 2 changed files: - src/app_actions.py - src/common/helpers.py Changes: ===================================== src/app_actions.py ===================================== --- a/src/app_actions.py +++ b/src/app_actions.py @@ -60,16 +60,15 @@ class AppActions(): gajim.interface.instances['accounts'] = config.AccountsWindow() def on_history_manager(self, action, param): - if os.name == 'nt': - if os.path.exists('history_manager.exe'): - # user is running frozen application - helpers.exec_command('history_manager.exe') - else: - # user is running from source - helpers.exec_command('%s history_manager.py' % sys.executable) - else: - # Unix user - helpers.exec_command('%s history_manager.py' % sys.executable) + config_path = '-c %s' % gajim.gajimpaths.config_root + posix = os.name != 'nt' + if os.path.exists('history_manager.exe'): # Windows + helpers.exec_command('history_manager.exe %s' % config_path, + posix=posix) + else: # Linux or running from Git + helpers.exec_command( + '%s history_manager.py %s' % (sys.executable, config_path), + posix=posix) def on_manage_bookmarks(self, action, param): config.ManageBookmarksWindow() ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -408,7 +408,7 @@ def is_in_path(command, return_abs_path=False): pass return False -def exec_command(command, use_shell=False): +def exec_command(command, use_shell=False, posix=True): """ execute a command. if use_shell is True, we run the command as is it was typed in a console. So it may be dangerous if you are not sure about what @@ -417,7 +417,7 @@ def exec_command(command, use_shell=False): if use_shell: subprocess.Popen('%s &' % command, shell=True).wait() else: - args = shlex.split(command) + args = shlex.split(command, posix=posix) p = subprocess.Popen(args) gajim.thread_interface(p.wait) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0b0812bb757b37eb3f5a10c70185602b19…

1 0

[Git][gajim/gajim][gajim_0.16] Start HistoryManager with config path argument
by Philipp Hörist 21 Apr '17

21 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 13d86057 by Philipp Hörist at 2017-04-21T18:34:54+02:00 Start HistoryManager with config path argument HistoryManager was not finding the Logs.db when Gajim was used with the -c config path argument - - - - - 2 changed files: - src/common/helpers.py - src/roster_window.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -405,7 +405,7 @@ def is_in_path(command, return_abs_path=False): pass return False -def exec_command(command, use_shell=False): +def exec_command(command, use_shell=False, posix=True): """ execute a command. if use_shell is True, we run the command as is it was typed in a console. So it may be dangerous if you are not sure about what @@ -414,7 +414,7 @@ def exec_command(command, use_shell=False): if use_shell: subprocess.Popen('%s &' % command, shell=True).wait() else: - args = shlex.split(command.encode('utf-8')) + args = shlex.split(command.encode('utf-8'), posix=posix) p = subprocess.Popen(args) gajim.thread_interface(p.wait) ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2856,13 +2856,15 @@ class RosterWindow: gajim.connections[account].send_motd(server) def on_history_manager_menuitem_activate(self, widget): - if os.name == 'nt': - if os.path.exists('history_manager.exe'): # user is running stable - helpers.exec_command('history_manager.exe') - else: # user is running svn - helpers.exec_command('%s history_manager.py' % sys.executable) - else: # Unix user - helpers.exec_command('%s history_manager.py' % sys.executable) + config_path = '-c %s' % gajim.gajimpaths.config_root + posix = os.name != 'nt' + if os.path.exists('history_manager.exe'): # Windows + helpers.exec_command('history_manager.exe %s' % config_path, + posix=posix) + else: # Linux or running from Git + helpers.exec_command( + '%s history_manager.py %s' % (sys.executable, config_path), + posix=posix) def on_info(self, widget, contact, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13d86057c7d2208a2cb8bf06fb738df93a…

1 0

[Git][gajim/gajim][gajim_0.16] Log more details on ImportError in cert check
by Philipp Hörist 21 Apr '17

21 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: ab3a7ed2 by Philipp Hörist at 2017-04-21T13:41:58+02:00 Log more details on ImportError in cert check - - - - - 1 changed file: - src/common/check_X509.py Changes: ===================================== src/common/check_X509.py ===================================== --- a/src/common/check_X509.py +++ b/src/common/check_X509.py @@ -173,8 +173,8 @@ try: return True return False except ImportError: - log.warn('Import of PyOpenSSL or pyasn1 failed. Cannot correctly check ' - 'SSL certificate') + log.exception('Import of PyOpenSSL or pyasn1 failed.' + 'Cannot correctly check SSL certificate') def check_certificate(cert, domain): subject = cert.get_subject() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab3a7ed25284a05fb45fe451cc7c215d0b…

1 0

[Git][gajim/gajim][master] 3 commits: zeroconf: string.letters has been removed with Python 3
by Philipp Hörist 19 Apr '17

19 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c058a1e1 by André Apitzsch at 2017-04-10T23:48:52+02:00 zeroconf: string.letters has been removed with Python 3 use ascii_letters which should be sufficient - - - - - 4725858a by André Apitzsch at 2017-04-10T23:53:54+02:00 zeroconf: 'to' is of type JID and no string use a class method to remove the resource from JID - - - - - 8e3e9b4d by Philipp Hörist at 2017-04-19T18:55:25+02:00 Merge branch 'zeroconf' into 'master' fix python errors in client zeroconf See merge request !82 - - - - - 1 changed file: - src/common/zeroconf/client_zeroconf.py Changes: ===================================== src/common/zeroconf/client_zeroconf.py ===================================== --- a/src/common/zeroconf/client_zeroconf.py +++ b/src/common/zeroconf/client_zeroconf.py @@ -756,7 +756,7 @@ class ClientZeroconf: if to is None: # Can’t send undirected stanza over Zeroconf. return -1 - to = gajim.get_jid_without_resource(to) + to = to.getStripped() stanza.setFrom(self.roster.zeroconf.name) try: @@ -801,7 +801,7 @@ class ClientZeroconf: """ Generate a random id """ - return ''.join(Random().sample(string.letters + string.digits, 6)) + return ''.join(Random().sample(string.ascii_letters + string.digits, 6)) def RegisterDisconnectHandler(self, handler): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/14091642c4b5dd33ca280504366b4caac…

1 0

[Git][gajim/gajim][master] 2 commits: Disable button if password changing is not supported
by Philipp Hörist 19 Apr '17

19 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d8379f4 by Marc Schink at 2017-04-19T18:17:22+02:00 Disable button if password changing is not supported - - - - - 14091642 by Philipp Hörist at 2017-04-19T18:54:20+02:00 Merge branch 'change_password_fix' into 'master' Disable button if password changing is not supported See merge request !85 - - - - - 2 changed files: - src/common/connection.py - src/config.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -779,6 +779,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.music_track_info = 0 self.location_info = {} self.pubsub_supported = False + self.register_supported = False self.pubsub_publish_options_supported = False # Do we auto accept insecure connection self.connection_auto_accepted = False @@ -2001,6 +2002,8 @@ class Connection(CommonConnection, ConnectionHandlers): if nbxmpp.NS_VCARD in obj.features: self.vcard_supported = True get_action(self.name + '-profile').set_enabled(True) + if nbxmpp.NS_REGISTER in obj.features: + self.register_supported = True if nbxmpp.NS_PUBSUB in obj.features: self.pubsub_supported = True if nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS in obj.features: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -1541,6 +1541,7 @@ class AccountsWindow: self.accounts_treeview = self.xml.get_object('accounts_treeview') self.remove_button = self.xml.get_object('remove_button') self.rename_button = self.xml.get_object('rename_button') + self.change_password_button = self.xml.get_object('change_password_button1') path_to_kbd_input_img = gtkgui_helpers.get_icon_path('gajim-kbd_input') img = self.xml.get_object('rename_image') img.set_from_file(path_to_kbd_input_img) @@ -1604,6 +1605,7 @@ class AccountsWindow: """ self.remove_button.set_sensitive(False) self.rename_button.set_sensitive(False) + self.change_password_button.set_sensitive(False) self.current_account = None model = self.accounts_treeview.get_model() model.clear() @@ -1713,9 +1715,15 @@ class AccountsWindow: if account: self.remove_button.set_sensitive(True) self.rename_button.set_sensitive(True) + + if account != gajim.ZEROCONF_ACC_NAME: + self.change_password_button.set_sensitive( + gajim.connections[account].register_supported) + else: self.remove_button.set_sensitive(False) self.rename_button.set_sensitive(False) + self.change_password_button.set_sensitive(False) if iter_: self.current_account = account if account == gajim.ZEROCONF_ACC_NAME: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c5aa507ec05f178772944b1a9185cff74…

1 0

[Git][gajim/gajim][master] 2 commits: Get rid of cairo dependency
by Philipp Hörist 19 Apr '17

19 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 358d410d by Philipp Hörist at 2017-04-19T16:58:16+02:00 Get rid of cairo dependency - - - - - c5aa507e by Philipp Hörist at 2017-04-19T17:10:01+02:00 Remove timeout id after AvatarWindow is shown - - - - - 3 changed files: - src/chat_control.py - src/dialogs.py - src/gtkgui_helpers.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1671,6 +1671,8 @@ class ChatControl(ChatControlBase): dialogs.BigAvatarWindow(avatar_pixbuf, pos_x, pos_y, avatar_w, avatar_h, self.show_avatar) + self.show_bigger_avatar_timeout_id = None + def _on_send_file_menuitem_activate(self, widget): self._on_send_file() ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -34,7 +34,6 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject from gi.repository import GLib -import cairo import os import nbxmpp import time @@ -5688,28 +5687,21 @@ class BigAvatarWindow(Gtk.Window): self.callback = callback self.screen = self.get_screen() self.visual = self.screen.get_rgba_visual() - if self.visual != None and self.screen.is_composited(): + if self.visual is not None and self.screen.is_composited(): self.set_visual(self.visual) self.set_app_paintable(True) self.set_size_request(width, height) self.move(pos_x, pos_y) - self.connect("draw", self.area_draw) # we should hide the window self.connect('leave_notify_event', self._on_window_avatar_leave_notify) self.connect('motion-notify-event', self._on_window_motion_notify) self.realize() # make the cursor invisible so we can see the image - invisible_cursor = gtkgui_helpers.get_invisible_cursor() - self.get_window().set_cursor(invisible_cursor) + self.get_window().set_cursor( + Gdk.Cursor.new(Gdk.CursorType.BLANK_CURSOR)) + self.add(Gtk.Image.new_from_pixbuf(self.avatar)) self.show_all() - def area_draw(self, widget, cr): - cr.set_source_rgba(.2, .2, .2, 0.0) - cr.set_operator(cairo.OPERATOR_SOURCE) - Gdk.cairo_set_source_pixbuf(cr, self.avatar, 0, 0) - cr.paint() - cr.set_operator(cairo.OPERATOR_OVER) - def _on_window_avatar_leave_notify(self, widget, event): """ Just left the popup window that holds avatar ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -486,14 +486,6 @@ def get_pixbuf_from_data(file_data, want_type = False): else: return pixbuf -def get_invisible_cursor(): - import cairo - s = cairo.ImageSurface(cairo.FORMAT_A1, 1, 1) - cursor_pixbuf = Gdk.pixbuf_get_from_surface(s, 0, 0, 1, 1) - cursor = Gdk.Cursor.new_from_pixbuf(Gdk.Display.get_default(), \ - cursor_pixbuf, 0, 0) - return cursor - def get_cursor(attr): display = Gdk.Display.get_default() cursor = getattr(Gdk.CursorType, attr) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/86e29fb7f460a9a93fe5af8981b041122…

1 0

[Git][gajim/gajim][master] 3 commits: Fix wrong inclusion check
by Philipp Hörist 18 Apr '17

18 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 09512065 by Philipp Hörist at 2017-04-18T18:26:06+02:00 Fix wrong inclusion check - - - - - d7a6b6ab by Philipp Hörist at 2017-04-18T18:56:57+02:00 Register new MAM Events - - - - - 86e29fb7 by Philipp Hörist at 2017-04-18T18:58:06+02:00 LegacyArchiving Event does not have a type - - - - - 3 changed files: - src/common/connection.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -2009,14 +2009,13 @@ class Connection(CommonConnection, ConnectionHandlers): # Remove stored bookmarks accessible to everyone. self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks') - if (nbxmpp.NS_MAM or nbxmpp.NS_MAM_1 or nbxmpp.NS_MAM_2) \ - in obj.features: - if nbxmpp.NS_MAM_2 in obj.features: - self.archiving_namespace = nbxmpp.NS_MAM_2 - elif nbxmpp.NS_MAM_1 in obj.features: - self.archiving_namespace = nbxmpp.NS_MAM_1 - else: - self.archiving_namespace = nbxmpp.NS_MAM + if nbxmpp.NS_MAM_2 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_2 + elif nbxmpp.NS_MAM_1 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_1 + elif nbxmpp.NS_MAM in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM + if self.archiving_namespace: self.archiving_supported = True self.archiving_313_supported = True get_action(self.name + '-archive').set_enabled(True) ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1451,6 +1451,10 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): ArchivingPreferencesChangedReceivedEvent) gajim.nec.register_incoming_event( Archiving313PreferencesChangedReceivedEvent) + gajim.nec.register_incoming_event( + ArchivingFinishedLegacyReceivedEvent) + gajim.nec.register_incoming_event( + ArchivingFinishedReceivedEvent) gajim.nec.register_incoming_event(NotificationEvent) gajim.ged.register_event_handler('http-auth-received', ged.CORE, ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1836,7 +1836,6 @@ class ArchivingFinishedLegacyReceivedEvent(nec.NetworkIncomingEvent): def generate(self): self.conn = self.base_event.conn self.stanza = self.base_event.stanza - self.type_ = self.base_event.type_ self.fin = self.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) if not self.fin: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b42c21d3e049cda4f9bb596c470dc3f00…

1 0

[Git][gajim/gajim][master] 3 commits: Add/Modify Events to handle all MAM namespaces
by Philipp Hörist 18 Apr '17

18 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8a028b5 by Philipp Hörist at 2017-04-18T17:48:58+02:00 Add/Modify Events to handle all MAM namespaces - - - - - 6b75f4ab by Philipp Hörist at 2017-04-18T17:50:15+02:00 Choose MAM namespace and save it - - - - - b42c21d3 by Philipp Hörist at 2017-04-18T17:52:17+02:00 Use new MAM Events and use chosen MAM namespace - - - - - 4 changed files: - src/common/connection.py - src/common/connection_handlers.py - src/common/connection_handlers_events.py - src/common/message_archiving.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -162,6 +162,7 @@ class CommonConnection: self.privacy_rules_supported = False self.vcard_supported = False self.private_storage_supported = False + self.archiving_namespace = None self.archiving_supported = False self.archiving_313_supported = False self.archiving_136_supported = False @@ -2008,7 +2009,14 @@ class Connection(CommonConnection, ConnectionHandlers): # Remove stored bookmarks accessible to everyone. self.send_pb_purge(our_jid, 'storage:bookmarks') self.send_pb_delete(our_jid, 'storage:bookmarks') - if nbxmpp.NS_MAM in obj.features: + if (nbxmpp.NS_MAM or nbxmpp.NS_MAM_1 or nbxmpp.NS_MAM_2) \ + in obj.features: + if nbxmpp.NS_MAM_2 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_2 + elif nbxmpp.NS_MAM_1 in obj.features: + self.archiving_namespace = nbxmpp.NS_MAM_1 + else: + self.archiving_namespace = nbxmpp.NS_MAM self.archiving_supported = True self.archiving_313_supported = True get_action(self.name + '-archive').set_enabled(True) ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -2332,6 +2332,8 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._PrivacySetCB, 'set', nbxmpp.NS_PRIVACY) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_ARCHIVE) con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM) + con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_1) + con.RegisterHandler('iq', self._ArchiveCB, ns=nbxmpp.NS_MAM_2) con.RegisterHandler('iq', self._PubSubCB, 'result') con.RegisterHandler('iq', self._PubSubErrorCB, 'error') con.RegisterHandler('iq', self._JingleCB, 'result') ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1187,8 +1187,10 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return self.forwarded = True - result = self.stanza.getTag('result', namespace=nbxmpp.NS_MAM) - if result: + result = self.stanza.getTag('result') + if result and result.getNamespace() in (nbxmpp.NS_MAM, + nbxmpp.NS_MAM_1, + nbxmpp.NS_MAM_2): forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) gajim.nec.push_incoming_event(MamMessageReceivedEvent(None, conn=self.conn, stanza=forwarded)) @@ -1793,21 +1795,57 @@ class Archiving313PreferencesChangedReceivedEvent(nec.NetworkIncomingEvent): self.default = None self.id = self.stanza.getID() self.answer = None + prefs = self.stanza.getTag('prefs') - if self.type_ != 'result': + if self.type_ != 'result' or not prefs: return - prefs = self.stanza.getTag('prefs', namespace=nbxmpp.NS_MAM) - if prefs: - self.default = prefs.getAttr('default') + self.default = prefs.getAttr('default') - for item in prefs.getTag('always').getTags('jid'): - self.items.append((item.getData(), 'Always')) + for item in prefs.getTag('always').getTags('jid'): + self.items.append((item.getData(), 'Always')) - for item in prefs.getTag('never').getTags('jid'): - self.items.append((item.getData(), 'Never')) - else: + for item in prefs.getTag('never').getTags('jid'): + self.items.append((item.getData(), 'Never')) + + return True + +class ArchivingFinishedReceivedEvent(nec.NetworkIncomingEvent): + name = 'archiving-finished' + base_network_events = ['archiving-received'] + + def generate(self): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + self.type_ = self.base_event.type_ + self.fin = self.stanza.getTag('fin') + + if self.type_ != 'result' or not self.fin: return + + self.queryid = self.fin.getAttr('queryid') + if not self.queryid: + return + + return True + +class ArchivingFinishedLegacyReceivedEvent(nec.NetworkIncomingEvent): + name = 'archiving-finished-legacy' + base_network_events = ['raw-message-received'] + + def generate(self): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + self.type_ = self.base_event.type_ + self.fin = self.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) + + if not self.fin: + return + + self.queryid = self.fin.getAttr('queryid') + if not self.queryid: + return + return True class AccountCreatedEvent(nec.NetworkIncomingEvent): ===================================== src/common/message_archiving.py ===================================== --- a/src/common/message_archiving.py +++ b/src/common/message_archiving.py @@ -46,8 +46,10 @@ class ConnectionArchive313(ConnectionArchive): self.archiving_313_supported = False self.mam_awaiting_disco_result = {} self.iq_answer = [] - gajim.ged.register_event_handler('raw-message-received', ged.CORE, - self._nec_raw_message_313_received) + gajim.ged.register_event_handler('archiving-finished-legacy', ged.CORE, + self._nec_result_finished) + gajim.ged.register_event_handler('archiving-finished', ged.CORE, + self._nec_result_finished) gajim.ged.register_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error) gajim.ged.register_event_handler('agent-info-received', ged.CORE, @@ -59,8 +61,10 @@ class ConnectionArchive313(ConnectionArchive): self._nec_archiving_313_preferences_changed_received) def cleanup(self): - gajim.ged.remove_event_handler('raw-message-received', ged.CORE, - self._nec_raw_message_313_received) + gajim.ged.remove_event_handler('archiving-finished-legacy', ged.CORE, + self._nec_result_finished) + gajim.ged.remove_event_handler('archiving-finished', ged.CORE, + self._nec_result_finished) gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error) gajim.ged.remove_event_handler('agent-info-received', ged.CORE, @@ -100,29 +104,23 @@ class ConnectionArchive313(ConnectionArchive): msg=msg_txt) del self.mam_awaiting_disco_result[obj.jid] - def _nec_raw_message_313_received(self, obj): + def _nec_result_finished(self, obj): if obj.conn.name != self.name: return - fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) - if fin_: - queryid_ = fin_.getAttr('queryid') - if queryid_ not in self.awaiting_answers: - return - else: + if obj.queryid not in self.awaiting_answers: return - if self.awaiting_answers[queryid_][0] == MAM_RESULTS_ARRIVED: - set_ = fin_.getTag('set', namespace=nbxmpp.NS_RSM) + if self.awaiting_answers[obj.queryid][0] == MAM_RESULTS_ARRIVED: + set_ = obj.fin.getTag('set', namespace=nbxmpp.NS_RSM) if set_: last = set_.getTagData('last') if last: gajim.config.set_per('accounts', self.name, 'last_mam_id', last) - complete = fin_.getAttr('complete') + complete = obj.fin.getAttr('complete') if complete != 'true': self.request_archive(after=last) - - del self.awaiting_answers[queryid_] + del self.awaiting_answers[obj.queryid] def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.name: @@ -133,9 +131,9 @@ class ConnectionArchive313(ConnectionArchive): def request_archive(self, start=None, end=None, with_=None, after=None, max=30): iq_ = nbxmpp.Iq('set') - query = iq_.addChild('query', namespace=nbxmpp.NS_MAM) + query = iq_.addChild('query', namespace=self.archiving_namespace) x = query.addChild(node=nbxmpp.DataForm(typ='submit')) - x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=nbxmpp.NS_MAM)) + x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=self.archiving_namespace)) if start: x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start)) if end: @@ -159,7 +157,7 @@ class ConnectionArchive313(ConnectionArchive): iq = nbxmpp.Iq(typ='get') id_ = self.connection.getAnID() iq.setID(id_) - iq.addChild(name='prefs', namespace=nbxmpp.NS_MAM) + iq.addChild(name='prefs', namespace=self.archiving_namespace) self.connection.send(iq) def set_archive_preferences(self, items, default): @@ -169,7 +167,7 @@ class ConnectionArchive313(ConnectionArchive): id_ = self.connection.getAnID() self.iq_answer.append(id_) iq.setID(id_) - prefs = iq.addChild(name='prefs', namespace=nbxmpp.NS_MAM, attrs={'default': default}) + prefs = iq.addChild(name='prefs', namespace=self.archiving_namespace, attrs={'default': default}) always = prefs.addChild(name='always') never = prefs.addChild(name='never') for item in items: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1d2320b0bbc13cf43cd900cee5c6a034a…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2017