Commits December 2016

commits@gajim.org

1 participants
37 discussions

[Git][gajim/gajim][gajim_0.16] 2 commits: Update files for appveyor Windows build
by Philipp Hörist 27 Dec '16

27 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: aaf4771b by Philipp Hörist at 2016-12-27T22:05:47+01:00 Update files for appveyor Windows build - - - - - 8a3ddae3 by Philipp Hörist at 2016-12-27T22:07:19+01:00 Merge branch 'appveyor' into 'gajim_0.16' Update files for appveyor Windows build See merge request !13 - - - - - 7 changed files: - .gitignore - + appveyor.yml - build.bat - + dependencys.ps1 - gajim.nsi - + requirements.txt - setup_win32.py Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ po/stamp-it stamp-h1 Makefile __pycache__/ +src/gtk/ syntax: regexp ^config\.* ===================================== appveyor.yml ===================================== --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,80 @@ +environment: + + matrix: + + - PYTHON: "C:\\Python27" + +branches: + only: + - gajim_0.16 + +clone_depth: 1 + +# Print Login Data for RDP Session on Build VM, in case the build has errors +# init: +# - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + +install: + - git clone --depth=1 --branch=master https://dev.gajim.org/gajim/gajim-plugins.git c:\projects\gajim-plugins + - git clone https://dev.gajim.org/gajim/gtk-windows-bin.git c:\projects\gtk + + # Download & Install Dependencys + - ps: c:\\projects\\gajim\\dependencys.ps1 + + - msiexec /i C:\cairo.msi /quiet + - msiexec /i C:\pygobject.msi /quiet + - msiexec /i C:\pygtk.msi /quiet + - msiexec /i C:\pygoocanvas.msi /quiet + - msiexec /i C:\bonjour.msi /quiet + + - set PATH=C:\\MinGW\\bin;%PATH% + - "%PYTHON%\\python.exe -m pip install --upgrade pip" + - "%PYTHON%\\python.exe -m pip install -r c:\\projects\\gajim\\requirements.txt" + + - ps: Add-Content C:\Python27\Lib\site-packages\google\__init__.py " " + - "%PYTHON%\\python.exe -m pip install --no-dependencies python-axolotl" + - "%PYTHON%\\python.exe -m pip install --global-option=build_ext --global-option --compiler=mingw32 python-axolotl-curve25519" + + # Prepare Build Dir + - cd c:\projects\gajim\ + - xcopy . ..\gajim_built /e /i + - cd ..\gajim_built + + # Copy Shipped Plugins + - xcopy ..\gajim-plugins\plugin_installer plugins\plugin_installer /e /i + + # Compile Translation Strings + - cmd: for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l + + # Make Gajim.exe + - "%PYTHON%\\python.exe setup_win32.py build_exe" + + - move build\exe.win32-2.7 . + - rmdir build + - rename exe.win32-2.7 bin + + # Add GTK files so we can make the Installer + - xcopy ..\gtk bin\gtk /e /i + + # Make Installer + - ps: '& "C:\Program Files (x86)\NSIS\makensis.exe" gajim.nsi' + + # Push Installer Exe + - ps: $env:TIME_STRING=(get-date).ToString(‘d-M-yyyy’) + - ps: Push-AppveyorArtifact Gajim.exe -FileName "Gajim-0.16.6-$($env:TIME_STRING).exe" + +build: off + +deploy: + # FTP deployment provider settings + - provider: FTP + protocol: ftp + host: panoramix.gajim.org + username: + secure: SNcOJDhUtBjfddbKXudE2w== + password: + secure: tQkYbcUb6nChCp0cdqo4CA== + folder: win_snap + active_mode: false + beta: true # enable alternative FTP library for 'ftp' and 'ftps' modes + debug: true \ No newline at end of file ===================================== build.bat ===================================== --- a/build.bat +++ b/build.bat @@ -1,38 +1,15 @@ -rmdir /S /Q gajim_built -rmdir /S /Q gajim_built +rmdir /S /Q ..\gajim_built -mkdir gajim_built -hg archive gajim_built -xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i - -copy msgfmt.exe gajim_built -copy gettextsrc.dll gajim_built -copy gettextlib.dll gajim_built -copy msvcr90.dll gajim_built - -cd gajim_built - -REM for libglade-2.0.0.dll -PATH=..\src\gtk\bin;%PATH% +xcopy . ..\gajim_built /e /i +xcopy ..\gajim-plugins\plugin_installer ..\gajim_built\plugins\plugin_installer /e /i +cd ..\gajim_built c:\python27\python.exe setup_win32.py build_exe move build\exe.win32-2.7 . rename exe.win32-2.7 bin -copy ..\LIBEAY32.dll bin -copy ..\SSLEAY32.dll bin - -REM for snarl plugin -xcopy ..\win32com bin\win32com /e /i - -mkdir bin\gtk -cd ../src/gtk -hg archive ..\..\gajim_built\bin\gtk -cd ../../gajim_built/ - -REM for msgfmt -PATH=bin\gtk\bin;%PATH% +xcopy ..\gtk bin\gtk /e /i for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l ===================================== dependencys.ps1 ===================================== --- /dev/null +++ b/dependencys.ps1 @@ -0,0 +1,22 @@ +# Download Dependencys + +$clnt = new-object System.Net.WebClient +$url = "https://gajim.org/downloads/snap/win/build/pycairo-1.8.10.win32-py2.7.msi" +$file = "c:\cairo.msi" +$clnt.DownloadFile($url,$file) + +$url = "https://gajim.org/downloads/snap/win/build/pygobject-2.28.3.win32-py2.7.msi" +$file = "c:\pygobject.msi" +$clnt.DownloadFile($url,$file) + +$url = "https://gajim.org/downloads/snap/win/build/pygtk-2.24.0.win32-py2.7.msi" +$file = "c:\pygtk.msi" +$clnt.DownloadFile($url,$file) + +$url = "https://gajim.org/downloads/snap/win/build/pygoocanvas-0.14.2.win32-py2.7.m…" +$file = "c:\pygoocanvas.msi" +$clnt.DownloadFile($url,$file) + +$url = "https://gajim.org/downloads/snap/win/build/Bonjour64.msi" +$file = "c:\bonjour.msi" +$clnt.DownloadFile($url,$file) \ No newline at end of file ===================================== gajim.nsi ===================================== --- a/gajim.nsi +++ b/gajim.nsi @@ -153,70 +153,7 @@ Section "Gajim" SecGajim File "COPYING" File "THANKS" File "THANKS.artists" - - SetOutPath "$INSTDIR\bin" - File "bin\_bsddb.pyd" - File "bin\_cffi_backend.pyd" - File "bin\_ctypes.pyd" - File "bin\_hashlib.pyd" - File "bin\_socket.pyd" - File "bin\_sqlite3.pyd" - File "bin\_ssl.pyd" - File "bin\atk.pyd" - File "bin\axolotl_curve25519.pyd" - File "bin\bz2.pyd" - File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher._AES.pyd" - File "bin\Crypto.Cipher._DES.pyd" - File "bin\Crypto.Cipher._DES3.pyd" - File "bin\Crypto.Hash._SHA256.pyd" - File "bin\Crypto.Random.OSRNG.winrandom.pyd" - File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" - File "bin\cryptography.hazmat.bindings._constant_time.pyd" - File "bin\cryptography.hazmat.bindings._openssl.pyd" - File "bin\cryptography.hazmat.bindings._padding.pyd" - File "bin\farstream.pyd" - File "bin\gajim.exe" - File "bin\gio._gio.pyd" - File "bin\glib._glib.pyd" - File "bin\gobject._gobject.pyd" - File "bin\goocanvas.pyd" - File "bin\gst._gst.pyd" - File "bin\gst.interfaces.pyd" - File "bin\gtk._gtk.pyd" - File "bin\history_manager.exe" - File "bin\libcurl.dll" - File "bin\libeay32.dll" - File "bin\libgoocanvas-3.dll" - File "bin\library.zip" - File "bin\libxml2mod.pyd" - File "bin\libxmlmods.libxml2mod.pyd" - File "bin\pangocairo.pyd" - File "bin\pango.pyd" - File "bin\PIL._imaging.pyd" - File "bin\PIL._imagingcms.pyd" - File "bin\PIL._imagingft.pyd" - File "bin\PIL._imagingmath.pyd" - File "bin\PIL._imagingmorph.pyd" - File "bin\PIL._imagingtk.pyd" - File "bin\PIL._webp.pyd" - File "bin\pycurl.pyd" - File "bin\pyexpat.pyd" - File "bin\python27.dll" - File "bin\pythoncom27.dll" - File "bin\pywintypes27.dll" - File "bin\select.pyd" - File "bin\sqlite3.dll" - File "bin\ssleay32.dll" - File "bin\unicodedata.pyd" - File "bin\win32api.pyd" - File "bin\win32file.pyd" - File "bin\win32pipe.pyd" - File "bin\win32ui.pyd" - File "bin\winsound.pyd" - File "msvcr90.dll" - File /r "bin\win32com" + File /r "bin" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" ===================================== requirements.txt ===================================== --- /dev/null +++ b/requirements.txt @@ -0,0 +1,14 @@ +setuptools +git+https://dev.gajim.org/gajim/python-nbxmpp.git +https://gajim.org/downloads/snap/win/build/pybonjour-1.1.1.zip +protobuf +pycrypto +cryptography +cx_freeze==4.3.4 +keyring +pypiwin32 +pyopenssl +future +gnupg +pillow +pycurl ===================================== setup_win32.py ===================================== --- a/setup_win32.py +++ b/setup_win32.py @@ -1,4 +1,4 @@ -## setup_win32.py (run me as python setup_win32.py py2exe -O2) +## setup_win32.py (run me as python setup_win32.py build_exe) ## ## Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> @@ -20,37 +20,25 @@ ## from cx_Freeze import setup, Executable -import glob import sys -import os sys.path.append('src') # Use local gtk folder instead of the one in PATH that is not latest gtk -if 'gtk' in os.listdir('.'): - sys.path.append('gtk/bin') +# if 'gtk' in os.listdir('.'): +# sys.path.append('gtk/bin') + +# probably not necessary anymore +# includes 'dumbdbm', 'dbhash', 'bsddb', +# 'gtk.keysyms', 'goocanvas' 'numbers', 'HTMLParser' options = { 'build_exe': { - 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', - 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser', 'pkg_resources'], - 'base': 'Win32GUI', - 'packages': ['cffi', 'cryptography', 'PIL', 'axolotl', 'google'], - 'bin_excludes': [ - 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', - 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', - 'libgio-2.0-0.dll', - 'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll', - 'libgobject-2.0-0.dll', 'libgthread-2.0-0.dll', - 'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll', - 'libpangowin32-1.0-0.dll', 'libcairo-2.dll', - 'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll', - 'libfarstream-0.1-0.dll', 'libgcc_s_dw2-1.dll', - 'libgstbase-0.10-0.dll', 'libgstcontroller-0.10-0.dll', - 'libgstdataprotocol-0.10-0.dll', 'libgstinterfaces-0.10-0.dll', - 'libgstnet-0.10-0.dll', 'libgstreamer-0.10-0.dll', - 'libiconv-2.dll', 'libxml2.dll', 'libxml2-2.dll', - ], + 'includes': ['win32com.server', 'win32com.client'], + 'packages': ['pkg_resources', 'cffi', 'gtk', + 'cryptography', 'Crypto', 'PIL', + 'axolotl', 'google'], + 'includes': ['new'], + 'excludes': ['Tkinter', 'unittest', 'psutil'], } } @@ -64,6 +52,11 @@ setup( download_url='http://gajim.org/downloads.php', license='GPL', options=options, - executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'), - Executable('src/history_manager.py', icon='data/pixmaps/gajim.ico')], + executables=[ + Executable( + 'src/gajim.py', base='Win32GUI', + icon='data/pixmaps/gajim.ico'), + Executable( + 'src/history_manager.py', base='Win32GUI', + icon='data/pixmaps/gajim.ico')], ) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6d76cfb2dd39bdbd7d5b4ec2f31ba68b0…

1 0

[Git][gajim/gajim][gajim_0.16] 2 commits: Make chat_merge_consecutive_nickname work in GC
by Philipp Hörist 24 Dec '16

24 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 67188cee by Philipp Hörist at 2016-12-19T19:23:33+01:00 Make chat_merge_consecutive_nickname work in GC - - - - - 6d76cfb2 by Philipp Hörist at 2016-12-24T09:03:54+01:00 Merge branch 'merge_nicks' into 'gajim_0.16' Make chat_merge_consecutive_nickname work in GC See merge request !8 - - - - - 2 changed files: - src/chat_control.py - src/conversation_textview.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -902,7 +902,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], - count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, + count_as_new=True, subject=None, xhtml=None, simple=False, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, correct_id=None): """ @@ -933,7 +933,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): else: textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, + subject, xhtml, simple=simple, graphics=graphics, displaymarking=displaymarking) if xep0184_id is not None: @@ -1454,7 +1454,6 @@ class ChatControl(ChatControlBase): ) = range(5) TYPE_ID = message_control.TYPE_CHAT - old_msg_kind = None # last kind of the printed message # Set a command host to bound to. Every command given through a chat will be # processed with this command host. @@ -2577,13 +2576,9 @@ class ChatControl(ChatControlBase): if xhtml: xhtml = '<body xmlns="%s">%s</body>' % (NS_XHTML, xhtml) ChatControlBase.print_conversation_line(self, text, kind, name, tim, - subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, + subject=subject, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, correct_id=correct_id) - if text.startswith('/me ') or text.startswith('/me\n'): - self.old_msg_kind = None - else: - self.old_msg_kind = kind def get_tab_label(self, chatstate): unread = '' @@ -3008,7 +3003,6 @@ class ChatControl(ChatControlBase): _('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 self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message msg = row[2] @@ -3040,12 +3034,7 @@ class ChatControl(ChatControlBase): {'subject': row[3], 'message': msg} ChatControlBase.print_conversation_line(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], - small_attr + ['restored_message'], False, - old_kind=local_old_kind, xhtml=xhtml) - if row[2].startswith('/me ') or row[2].startswith('/me\n'): - local_old_kind = None - else: - local_old_kind = kind + small_attr + ['restored_message'], False, xhtml=xhtml) if len(rows): self.conv_textview.print_empty_line() ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -218,6 +218,10 @@ class ConversationTextview(gobject.GObject): # It's True when we scroll in the code, so we can detect scroll from user self.auto_scrolling = False + # This holds the last Nickname we received a msg from + # for chat_merge_consecutive_nickname feature + self.last_msg_name = None + # connect signals id_ = self.tv.connect('motion_notify_event', self.on_textview_motion_notify_event) @@ -1228,7 +1232,7 @@ class ConversationTextview(gobject.GObject): def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], - subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, + subject=None, xhtml=None, simple=False, graphics=True, displaymarking=None, iter_=None): """ Print 'chat' type messages @@ -1275,8 +1279,6 @@ class ConversationTextview(gobject.GObject): self.marks_queue.put(mark) if kind == 'incoming_queue': kind = 'incoming' - if old_kind == 'incoming_queue': - old_kind = 'incoming' # print the time stamp if not tim: # We don't have tim for outgoing messages... @@ -1325,13 +1327,20 @@ class ConversationTextview(gobject.GObject): mark1 = mark else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): - if kind != old_kind or self.just_cleared: + if self.last_msg_name != name or self.just_cleared: + # Textview is empty or this is a msg from a new user + # Print the Nickname self.print_name(name, kind, other_tags_for_name, direction_mark=direction_mark, iter_=end_iter) else: + # The last message was from the same Nickname + # Dont print the Nickname self.print_real_text(gajim.config.get( 'chat_merge_consecutive_nickname_indent'), iter_=end_iter) + # Save the last Chatname so we know if we have to + # print the nickname on the next message + self.last_msg_name = name else: self.print_name(name, kind, other_tags_for_name, direction_mark=direction_mark, iter_=end_iter) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bb7e4a4366f77f94d5da6c367408872f6…

1 0

[Git][gajim/gajim][master] 3 commits: Apply automatic changes from glade 3.20.
by Philipp Hörist 24 Dec '16

24 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: db2b6e5e by Emmanuel Gil Peyrot at 2016-12-24T02:49:59+01:00 Apply automatic changes from glade 3.20. - - - - - c1c2a516 by Emmanuel Gil Peyrot at 2016-12-24T02:51:55+01:00 Replace formatting button with declarative menu. This prevents Gajim from having to regenerate the menu everytime it is clicked on. - - - - - c52046f5 by Philipp Hörist at 2016-12-24T09:01:39+01:00 Merge branch 'formatting-menu' into 'master' Make the formatting menu declarative. See merge request !10 - - - - - 4 changed files: - data/gui/chat_control.ui - src/chat_control.py - src/message_control.py - src/message_textview.py Changes: ===================================== data/gui/chat_control.ui ===================================== --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkAdjustment" id="adjustment1"> @@ -278,6 +278,85 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> + </object> + <object class="GtkMenu" id="formattings_menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkCheckMenuItem" id="bold"> + <property name="name">bold</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Bold</property> + <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="italic"> + <property name="name">italic</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Italic</property> + <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="underline"> + <property name="name">underline</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Underline</property> + <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkCheckMenuItem" id="strike"> + <property name="name">strike</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Strike</property> + <signal name="activate" handler="on_formatting_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="color"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Color</property> + <signal name="activate" handler="on_color_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkMenuItem" id="font"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font</property> + <signal name="activate" handler="on_font_menuitem_activate" swapped="no"/> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkMenuItem" id="clear_formatting"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Clear formatting</property> + <signal name="activate" handler="on_clear_formatting_menuitem_activate" swapped="no"/> + </object> + </child> </object> <object class="GtkImage" id="image4"> <property name="visible">True</property> @@ -525,11 +604,11 @@ <child> <object class="GtkButton" id="authentication_button"> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="lock_image"> <property name="visible">True</property> @@ -584,13 +663,13 @@ <object class="GtkButton" id="emoticons_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="emoticons_button_image"> <property name="visible">True</property> @@ -608,14 +687,15 @@ </packing> </child> <child> - <object class="GtkButton" id="formattings_button"> + <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> + <property name="popup">formattings_menu</property> <child> <object class="GtkImage" id="image10"> <property name="visible">True</property> @@ -674,10 +754,10 @@ <object class="GtkButton" id="send_file_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="image3"> <property name="visible">True</property> @@ -739,13 +819,13 @@ <object class="GtkButton" id="convert_to_gc_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="tooltip_text" translatable="yes">Invite contacts to the conversation (Ctrl+G)</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="convert_to_gc_button_image"> <property name="visible">True</property> @@ -766,13 +846,13 @@ <object class="GtkButton" id="contact_information_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Show the contact&apos;s profile (Ctrl+I)</property> <property name="tooltip_text" translatable="yes">Show the contact's profile (Ctrl+I)</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="image2"> <property name="visible">True</property> @@ -793,13 +873,13 @@ <object class="GtkButton" id="history_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="history_image"> <property name="visible">True</property> @@ -832,13 +912,13 @@ <object class="GtkButton" id="message_window_actions_button"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Show advanced functions (Alt+D)</property> <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> @@ -875,10 +955,10 @@ <object class="GtkVolumeButton" id="sound_hscale"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <property name="orientation">vertical</property> <property name="adjustment">adjustment1</property> <property name="icons">audio-volume-muted @@ -908,10 +988,10 @@ audio-volume-medium</property> <object class="GtkVolumeButton" id="mic_hscale"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="focus_on_click">False</property> <property name="receives_default">True</property> <property name="has_tooltip">True</property> <property name="relief">none</property> - <property name="focus_on_click">False</property> <property name="orientation">vertical</property> <property name="adjustment">adjustment2</property> <property name="icons">audio-mic-volume-muted ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -373,10 +373,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): widget.set_sensitive(False) self.handlers[id_] = widget - widget = self.xml.get_object('formattings_button') - id_ = widget.connect('clicked', self.on_formattings_button_clicked) - self.handlers[id_] = widget - # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 @@ -979,64 +975,25 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): gajim.interface.emoticon_menuitem_clicked = self.append_emoticon gajim.interface.popup_emoticons_under_button(widget, self.parent_win) - def on_formattings_button_clicked(self, widget): - """ - Popup formattings menu - """ - menu = Gtk.Menu() - - menuitems = ((_('Bold'), 'bold'), - (_('Italic'), 'italic'), - (_('Underline'), 'underline'), - (_('Strike'), 'strike')) - - active_tags = self.msg_textview.get_active_tags() - - for menuitem in menuitems: - item = Gtk.CheckMenuItem.new_with_label(menuitem[0]) - if menuitem[1] in active_tags: - item.set_active(True) - else: - item.set_active(False) - item.connect('activate', self.msg_textview.set_tag, - menuitem[1]) - menu.append(item) - - item = Gtk.SeparatorMenuItem.new() # separator - menu.append(item) - - item = Gtk.MenuItem.new_with_label(_('Color')) - item.connect('activate', self.on_color_menuitem_activale) - menu.append(item) - - item = Gtk.MenuItem.new_with_label(_('Font')) - item.connect('activate', self.on_font_menuitem_activale) - menu.append(item) - - item = Gtk.SeparatorMenuItem.new() # separator - menu.append(item) - - item = Gtk.MenuItem.new_with_label(_('Clear formating')) - item.connect('activate', self.msg_textview.clear_tags) - menu.append(item) - - menu.show_all() - menu.attach_to_widget(widget, None) - gtkgui_helpers.popup_emoticons_under_button(menu, widget, - self.parent_win) - - def on_color_menuitem_activale(self, widget): + def on_color_menuitem_activate(self, widget): color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window) color_dialog.set_use_alpha(False) color_dialog.connect('response', self.msg_textview.color_set) color_dialog.show_all() - def on_font_menuitem_activale(self, widget): + def on_font_menuitem_activate(self, widget): font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) start, finish = self.msg_textview.get_active_iters() font_dialog.connect('response', self.msg_textview.font_set, start, finish) font_dialog.show_all() + def on_formatting_menuitem_activate(self, widget): + tag = widget.get_name() + self.msg_textview.set_tag(tag) + + def on_clear_formatting_menuitem_activate(self, widget): + self.msg_textview.clear_tags() + def on_actions_button_clicked(self, widget): """ Popup action menu ===================================== src/message_control.py ===================================== --- a/src/message_control.py +++ b/src/message_control.py @@ -64,6 +64,7 @@ class MessageControl(object): gajim.last_message_time[self.account][self.get_full_jid()] = 0 self.xml = gtkgui_helpers.get_gtk_builder('%s.ui' % widget_name) + self.xml.connect_signals(self) self.widget = self.xml.get_object('%s_hbox' % widget_name) gajim.ged.register_event_handler('message-outgoing', ged.OUT_GUI1, ===================================== src/message_textview.py ===================================== --- a/src/message_textview.py +++ b/src/message_textview.py @@ -122,7 +122,7 @@ class MessageTextView(Gtk.TextView): start, finish = _buffer.get_bounds() return (start, finish) - def set_tag(self, widget, tag): + def set_tag(self, tag): _buffer = self.get_buffer() start, finish = self.get_active_iters() if start.has_tag(self.other_tags[tag]): @@ -134,7 +134,7 @@ class MessageTextView(Gtk.TextView): _buffer.remove_tag_by_name('underline', start, finish) _buffer.apply_tag_by_name(tag, start, finish) - def clear_tags(self, widget): + def clear_tags(self): _buffer = self.get_buffer() start, finish = self.get_active_iters() _buffer.remove_all_tags(start, finish) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8212bc250becb43a4b4f1f13800329bf3…

1 0

[Git][gajim/gajim][master] 2 commits: Use GLib to retrieve the pictures directory.
by Philipp Hörist 24 Dec '16

24 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd074785 by Emmanuel Gil Peyrot at 2016-12-24T04:58:30+01:00 Use GLib to retrieve the pictures directory. Also remove an unused function. - - - - - 8212bc25 by Philipp Hörist at 2016-12-24T08:50:35+01:00 Merge branch 'use-glib-directories' into 'master' Use GLib to retrieve the pictures directory. See merge request !12 - - - - - 2 changed files: - src/common/helpers.py - src/dialogs.py Changes: ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -497,19 +497,6 @@ r'Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders') win32api.RegCloseKey(rkey) return val -def get_my_pictures_path(): - """ - Windows-only atm - """ - return get_windows_reg_env('My Pictures') - -def get_desktop_path(): - if os.name == 'nt': - path = get_windows_reg_env('Desktop') - else: - path = os.path.join(os.path.expanduser('~'), 'Desktop') - return path - def get_documents_path(): if os.name == 'nt': path = get_windows_reg_env('Personal') ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -4960,13 +4960,7 @@ class ImageChooserDialog(FileChooserDialog): else: callback(widget, path_to_file) - try: - if os.name == 'nt': - path = helpers.get_my_pictures_path() - else: - path = os.environ['HOME'] - except Exception: - path = '' + path = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES) FileChooserDialog.__init__(self, title_text = _('Choose Image'), action = Gtk.FileChooserAction.OPEN, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b43811df88092d918c0000347dac43cd9…

1 0

[Git][gajim/gajim][gajim_0.16] Fix getting commit hash for version info
by Philipp Hörist 23 Dec '16

23 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: bb7e4a43 by Philipp Hörist at 2016-12-23T20:57:38+01:00 Fix getting commit hash for version info - - - - - 1 changed file: - src/common/defs.py Changes: ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -23,20 +23,22 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import subprocess +import sys +import os.path + docdir = '../' -basedir = '../' +basedir = '../' localedir = '../po' - version = '0.16.6' -import subprocess + try: - node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, + node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, stdout=subprocess.PIPE).communicate()[0] if node: version += '-' + node except Exception: pass -import sys, os.path for base in ('.', 'common'): sys.path.append(os.path.join(base, '.libs')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bb7e4a4366f77f94d5da6c367408872f62…

1 0

[Git][gajim/gajim][master] Fix getting commit hash for version info
by Philipp Hörist 23 Dec '16

23 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: b43811df by Philipp Hörist at 2016-12-23T20:52:24+01:00 Fix getting commit hash for version info - - - - - 1 changed file: - src/common/defs.py Changes: ===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -23,20 +23,22 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import subprocess +import sys +import os.path + docdir = '../' -basedir = '../' +basedir = '../' localedir = '../po' - version = '0.16.10.2' -import subprocess + try: - node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, + node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, stdout=subprocess.PIPE).communicate()[0] if node: version += '-' + node.decode('utf-8') except Exception: pass -import sys, os.path for base in ('.', 'common'): sys.path.append(os.path.join(base, '.libs')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b43811df88092d918c0000347dac43cd94…

1 0

[Git][gajim/gajim][gajim_0.16] Correctly search for chat_control when message receipts are received (XEP-0184) …
by Thilo Molitor 23 Dec '16

23 Dec '16

Thilo Molitor pushed to branch gajim_0.16 at gajim / gajim Commits: 35b6f3c1 by Thilo Molitor at 2016-12-23T15:33:40+01:00 Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session - - - - - 1 changed file: - src/common/connection_handlers.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1219,11 +1219,12 @@ class ConnectionHandlersBase: self.name, 'request_receipt'): ctrl = obj.session.control if not ctrl: - # Received <message> doesn't have the <thread> element? - # search in all sessions - for s in self.get_sessions(obj.jid): - if s.control: - ctrl = s.control + # Received <message> doesn't have the <thread> element + # or control is not bound to session? + # --> search for it + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) + if ctrl: id_ = obj.receipt_received_tag.getAttr('id') if not id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35b6f3c1fdd0940fa5b5ee17f354b8fcd9…

1 0

[Git][gajim/gajim][master] 3 commits: Correctly search for chat_control when message receipts are received (XEP-0184) …
by Thilo Molitor 23 Dec '16

23 Dec '16

Thilo Molitor pushed to branch master at gajim / gajim Commits: 55eaf70f by Thilo Molitor at 2016-12-16T21:53:51+01:00 Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session - - - - - c48f0419 by Thilo Molitor at 2016-12-18T04:22:08+01:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - f15497b0 by Thilo Molitor at 2016-12-23T15:21:03+01:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - 1 changed file: - src/common/connection_handlers.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1203,11 +1203,12 @@ class ConnectionHandlersBase: self.name, 'request_receipt'): ctrl = obj.session.control if not ctrl: - # Received <message> doesn't have the <thread> element? - # search in all sessions - for s in self.get_sessions(obj.jid): - if s.control: - ctrl = s.control + # Received <message> doesn't have the <thread> element + # or control is not bound to session? + # --> search for it + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) + if ctrl: id_ = obj.receipt_received_tag.getAttr('id') if not id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac4859fb87ef74564e1514a8789031616…

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 22 Dec '16

22 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac4859fb by Philipp Hörist at 2016-12-22T18:19:24+01:00 Remove unused imports - - - - - 28 changed files: - src/chat_control.py - src/common/caps_cache.py - src/common/check_paths.py - src/common/config.py - src/common/dbus_support.py - src/common/fuzzyclock.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle_rtp.py - src/common/logging_helpers.py - src/common/multimedia_helpers.py - src/common/optparser.py - src/common/resolver.py - src/common/sleepy.py - src/config.py - src/conversation_textview.py - src/dialogs.py - src/disco.py - src/features_window.py - src/gtkgui_helpers.py - src/history_manager.py - src/htmltextview.py - src/message_textview.py - src/network_manager_listener.py - src/notify.py - src/roster_window.py - src/statusicon.py - src/tooltips.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -29,9 +29,6 @@ import os import time -import gi -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -58,7 +55,6 @@ from message_textview import MessageTextView from common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from common.contacts import GC_Contact from common.logger import constants -from common.pep import MOODS, ACTIVITIES from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO ===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -38,7 +38,7 @@ import logging log = logging.getLogger('gajim.c.caps_cache') from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, ===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -26,7 +26,6 @@ import os import shutil import sys -import stat from common import gajim from common import logger ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -32,9 +32,7 @@ ## -import sys import re -import copy from common import defs from gi.repository import GLib ===================================== src/common/dbus_support.py ===================================== --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -24,7 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os, sys +import os from common import gajim from common import exceptions ===================================== src/common/fuzzyclock.py ===================================== --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -32,7 +32,6 @@ in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE). So most of the credit goes to this guys, thanks :-) """ -import time class FuzzyClock: HOUR_NAMES = [ _('twelve'), _('one'), _('two'), _('three'), _('four'), ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -27,7 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys import os import logging import locale @@ -201,10 +200,6 @@ try: from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst - gi.require_version('GdkX11', '3.0') - from gi.repository import GdkX11 - gi.require_version('GstVideo', '1.0') - from gi.repository import GstVideo from gi.repository import GLib try: Gst.init(None) ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -31,7 +31,6 @@ import sys import re -import locale import os import subprocess import urllib ===================================== src/common/jingle_rtp.py ===================================== --- a/src/common/jingle_rtp.py +++ b/src/common/jingle_rtp.py @@ -17,20 +17,13 @@ Handles Jingle RTP sessions (XEP 0167) """ -from collections import deque - -from gi.repository import GLib import socket - import nbxmpp -from gi.repository import Farstream import gi +from gi.repository import Farstream + gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo from gi.repository import GLib from common import gajim @@ -40,6 +33,7 @@ from common.jingle_content import contents, JingleContent, JingleContentSetupExc from common.connection_handlers_events import InformationEvent from common.jingle_session import FailedApplication +from collections import deque import logging log = logging.getLogger('gajim.c.jingle_rtp') ===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -19,7 +19,6 @@ ## import logging -from common import i18n def parseLogLevel(arg): """ ===================================== src/common/multimedia_helpers.py ===================================== --- a/src/common/multimedia_helpers.py +++ b/src/common/multimedia_helpers.py @@ -16,10 +16,6 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo class DeviceManager(object): ===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -28,7 +28,6 @@ import os import sys -import locale import re from time import time from common import gajim ===================================== src/common/resolver.py ===================================== --- a/src/common/resolver.py +++ b/src/common/resolver.py @@ -18,8 +18,6 @@ ## import sys -import os -import re import logging import functools log = logging.getLogger('gajim.c.resolver') @@ -30,8 +28,6 @@ if __name__ == '__main__': import common.configpaths common.configpaths.gajimpaths.init(None) -from common import helpers -from nbxmpp.idlequeue import IdleCommand from gi.repository import Gio, GLib @@ -132,7 +128,6 @@ class GioResolver(CommonResolver): # below lines is on how to use API and assist in testing if __name__ == '__main__': - from gi.repository import GLib from gi.repository import Gtk from nbxmpp import idlequeue ===================================== src/common/sleepy.py ===================================== --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -23,7 +23,6 @@ from common import gajim import os -import sys STATE_UNKNOWN = 'OS probably not supported' ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -36,7 +36,7 @@ from gi.repository import Gdk from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib -import os, sys +import os import common.config import common.sleepy from common.i18n import Q_ ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -39,7 +39,6 @@ import time import os import tooltips import dialogs -import locale import queue import urllib ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -42,7 +42,6 @@ import time import gtkgui_helpers import vcard import conversation_textview -import message_control import dataforms_widget from common import defs ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -44,7 +44,6 @@ # the functionality) # There are more methods, of course, but this is a basic set. -import os import types import weakref from gi.repository import GLib ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -24,7 +24,6 @@ ## import os -import sys import gi from gi.repository import Gtk import gtkgui_helpers ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -36,13 +36,11 @@ from gi.repository import GLib from gi.repository import Pango import os import sys -import importlib try: from PIL import Image except: pass from io import BytesIO -import array import logging log = logging.getLogger('gajim.gtkgui_helpers') ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -52,7 +52,6 @@ import signal import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk -gi.require_version('GdkX11', '3.0') from gi.repository import Gdk from gi.repository import GLib import time ===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -41,11 +41,11 @@ from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -import xml.sax, xml.sax.handler +import xml.sax +import xml.sax.handler import re from io import StringIO import urllib -import operator if __name__ == '__main__': from common import i18n ===================================== src/message_textview.py ===================================== --- a/src/message_textview.py +++ b/src/message_textview.py @@ -24,12 +24,10 @@ import gc from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GObject from gi.repository import GLib from gi.repository import Pango -import gtkgui_helpers from common import gajim class MessageTextView(Gtk.TextView): ===================================== src/network_manager_listener.py ===================================== --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -21,7 +21,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys from common import gajim ===================================== src/notify.py ===================================== --- a/src/notify.py +++ b/src/notify.py @@ -33,7 +33,6 @@ from dialogs import PopupNotificationWindow from gi.repository import GObject from gi.repository import GLib import gtkgui_helpers -from gi.repository import Gtk from common import gajim from common import helpers ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -74,7 +74,6 @@ if dbus_support.supported: import dbus from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE -from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) ( ===================================== src/statusicon.py ===================================== --- a/src/statusicon.py +++ b/src/statusicon.py @@ -23,7 +23,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -33,7 +32,6 @@ import dialogs import config import tooltips import gtkgui_helpers -import tooltips from common import gajim from common import helpers ===================================== src/tooltips.py ===================================== --- a/src/tooltips.py +++ b/src/tooltips.py @@ -33,7 +33,6 @@ from gi.repository import Gdk from gi.repository import GLib import os import time -import locale from datetime import datetime from datetime import timedelta View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4859fb87ef74564e1514a87890316165…

1 0

[Git][gajim/gajim][gajim_0.16] Use correct arguments for error_cb() Fixes #8484
by Philipp Hörist 21 Dec '16

21 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: f8122235 by Philipp Hörist at 2016-12-21T18:56:32+01:00 Use correct arguments for error_cb() Fixes #8484 - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -768,7 +768,7 @@ class ConnectionIBBytestream(ConnectionBytestream): elif typ == 'result': self.SendHandler() elif typ == 'error': - gajim.socks5queue.error_cb() + gajim.socks5queue.error_cb('Error', stanza.getErrorMsg()) else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_BAD_REQUEST)) raise nbxmpp.NodeProcessed View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f81222353642bf51d482a660545b8591d3…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2016