Commits September 2017

commits@gajim.org

1 participants
49 discussions

[Git][gajim/gajim][master] Use curl for Windows build instead of wget
by Philipp Hörist 30 Sep '17

30 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab23757f by Philipp Hörist at 2017-09-30T18:00:39+02:00 Use curl for Windows build instead of wget wget seems to be broken currently on appveyor - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -130,7 +130,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install plugin installer - wget -P "${BUILD_ROOT}" -c https://ftp.gajim.org/plugins_1/plugin_installer.zip + curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_1/plugin_installer.zip mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab23757f09a8cb194ebf0a4441fb44f169… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab23757f09a8cb194ebf0a4441fb44f169… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set message as read before removing an event
by Philipp Hörist 29 Sep '17

29 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f472cc1 by Philipp Hörist at 2017-09-29T12:41:26+02:00 Set message as read before removing an event When we receive carbons of a conversation, we remove the events once we receive a carbon from ourself, because that means we anwered from another device. This sets these removed messages also as read in the unread_message table, so they dont popup on restart. - - - - - 1 changed file: - gajim/session.py Changes: ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -247,6 +247,12 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False + unread_events = app.events.get_events( + self.conn.name, fjid, types=['chat']) + read_ids = [] + for msg in unread_events: + read_ids.append(msg.msg_log_id) + app.logger.set_read_messages(read_ids) app.events.remove_events(self.conn.name, fjid, types=['chat']) do_event = False else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f472cc120142691c6a46ff95cb494b941… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f472cc120142691c6a46ff95cb494b941… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove GTK Theme on Windows
by Philipp Hörist 29 Sep '17

29 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: a17a0307 by Philipp Hörist at 2017-09-29T02:57:58+02:00 Remove GTK Theme on Windows Standard is good enough - - - - - 30 changed files: - win/_base.sh - − win/etc/gtk-3.0/settings.ini - − win/themes/VimixLight/gtk-3.0/assets/assets/check-checked-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/check-checked-symbolic.svg - − win/themes/VimixLight/gtk-3.0/assets/assets/check-dash-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/check-dash-symbolic.svg - − win/themes/VimixLight/gtk-3.0/assets/assets/check-unchecked-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/check-unchecked-symbolic.svg - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-hover-selectionmode-dark.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-hover-selectionmode-dark(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-hover-selectionmode.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-hover-selectionmode(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-selectionmode-dark.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-selectionmode-dark(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-selectionmode.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-checked-selectionmode(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-hover-selectionmode-dark.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-hover-selectionmode-dark(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-hover-selectionmode.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-hover-selectionmode(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-selectionmode-dark.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-selectionmode-dark(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-selectionmode.png - − win/themes/VimixLight/gtk-3.0/assets/assets/checkbox-selectionmode(a)2.png - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-checked-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-checked-symbolic.svg - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-dash-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-dash-symbolic.svg - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-unchecked-symbolic.png - − win/themes/VimixLight/gtk-3.0/assets/assets/radio-unchecked-symbolic.svg The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a17a030719dffcc60d0aadd6394433033c… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a17a030719dffcc60d0aadd6394433033c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Allow Plugins to use other dialogs
by Philipp Hörist 29 Sep '17

29 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: dd39067e by Philipp Hörist at 2017-09-29T02:40:01+02:00 Allow Plugins to use other dialogs - - - - - b9aba06f by Philipp Hörist at 2017-09-29T02:41:03+02:00 Remove unused variables - - - - - 83f4d6e1 by Philipp Hörist at 2017-09-29T02:43:29+02:00 OptionsDialog: Destroy dialog on ESC - - - - - 2 changed files: - gajim/options_dialog.py - gajim/plugins/gui.py Changes: ===================================== gajim/options_dialog.py ===================================== --- a/gajim/options_dialog.py +++ b/gajim/options_dialog.py @@ -35,6 +35,11 @@ class OptionsDialog(Gtk.ApplicationWindow): self.show_all() self.listbox.connect('row-activated', self.on_row_activated) + self.connect('key-press-event', self.on_key_press) + + def on_key_press(self, widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() @staticmethod def on_row_activated(listbox, row): ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -135,9 +135,6 @@ class PluginsWindow(object): model, iter = treeview_selection.get_selected() if iter: plugin = model.get_value(iter, Column.PLUGIN) - plugin_name = model.get_value(iter, Column.NAME) - is_active = model.get_value(iter, Column.ACTIVE) - self._display_installed_plugin_info(plugin) else: self._clear_installed_plugin_info() @@ -236,11 +233,11 @@ class PluginsWindow(object): model, iter = selection.get_selected() if iter: plugin = model.get_value(iter, Column.PLUGIN) - plugin_name = model.get_value(iter, Column.NAME) - is_active = model.get_value(iter, Column.ACTIVE) - - result = plugin.config_dialog.run(self.window) + if isinstance(plugin.config_dialog, GajimPluginConfigDialog): + plugin.config_dialog.run(self.window) + else: + plugin.config_dialog(self.window) else: # No plugin selected. this should never be reached. As configure @@ -254,8 +251,6 @@ class PluginsWindow(object): model, iter = selection.get_selected() if iter: plugin = model.get_value(iter, Column.PLUGIN) - plugin_name = model.get_value(iter, Column.NAME) - is_active = model.get_value(iter, Column.ACTIVE) try: app.plugin_manager.remove_plugin(plugin) except PluginsystemError as e: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/69248b2fe7bd01c5981154d6c8c1bae31… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/69248b2fe7bd01c5981154d6c8c1bae31… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint/pep8 errors
by Philipp Hörist 28 Sep '17

28 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 69248b2f by Philipp Hörist at 2017-09-29T00:11:29+02:00 Fix pylint/pep8 errors - - - - - 3 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -433,10 +433,10 @@ class CommonConnection: return app.logger.insert_into_logs(jid, obj.timestamp, obj.kind, - message=obj.message, - subject=obj.subject, - additional_data=obj.additional_data, - stanza_id=obj.stanza_id) + message=obj.message, + subject=obj.subject, + additional_data=obj.additional_data, + stanza_id=obj.stanza_id) def ack_subscribed(self, jid): """ ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -1059,10 +1059,10 @@ class ConnectionHandlersBase: show = app.logger.convert_show_values_to_db_api_values(obj.show) if show is not None: app.logger.insert_into_logs(nbxmpp.JID(obj.jid).getStripped(), - time_time(), - KindConstant.STATUS, - message=obj.status, - show=show) + time_time(), + KindConstant.STATUS, + message=obj.status, + show=show) def _nec_gc_presence_received(self, obj): if obj.conn.name != self.name: @@ -1185,11 +1185,11 @@ class ConnectionHandlersBase: # usually it hold description and can be send at each connection # so don't store it in logs app.logger.insert_into_logs(obj.jid, - obj.timestamp, - KindConstant.GC_MSG, - message=obj.msgtxt, - contact_name=obj.nick, - additional_data=obj.additional_data) + obj.timestamp, + KindConstant.GC_MSG, + message=obj.msgtxt, + contact_name=obj.nick, + additional_data=obj.additional_data) # store in memory time of last message logged. # this will also be saved in rooms_last_message_time table # when we quit this muc @@ -1207,10 +1207,10 @@ class ConnectionHandlersBase: if session.is_loggable(): app.logger.insert_into_logs(nbxmpp.JID(frm).getStripped(), - tim, - KindConstant.ERROR, - message=error_msg, - subject=subject) + tim, + KindConstant.ERROR, + message=error_msg, + subject=subject) app.nec.push_incoming_event(MessageErrorEvent(None, conn=self, fjid=frm, error_code=msg.getErrorCode(), error_msg=error_msg, ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -869,11 +869,11 @@ class GcPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): if show is not None: fjid = nbxmpp.JID(self.fjid) app.logger.insert_into_logs(fjid.getStripped(), - time_time(), - KindConstant.GCSTATUS, - contact_name=fjid.getResource(), - message=st, - show=show) + time_time(), + KindConstant.GCSTATUS, + contact_name=fjid.getResource(), + message=st, + show=show) if self.avatar_sha == '': # contact has no avatar puny_nick = helpers.sanitize_filename(self.nick) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69248b2fe7bd01c5981154d6c8c1bae310… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/69248b2fe7bd01c5981154d6c8c1bae310… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Replace deprecated Gtk.Image.*_from_stock()
by Philipp Hörist 28 Sep '17

28 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5794b040 by André Apitzsch at 2017-09-28T19:42:00+02:00 Replace deprecated Gtk.Image.*_from_stock() - - - - - 646ace53 by Philipp Hörist at 2017-09-28T22:43:25+02:00 Merge branch 'replaceDeprecated' into 'master' Replace deprecated Gtk.Image.set_from_stock() See merge request !137 - - - - - 5 changed files: - gajim/chat_control.py - gajim/config.py - gajim/disco.py - gajim/filetransfers_window.py - gajim/tooltips.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -461,17 +461,17 @@ class ChatControl(ChatControlBase): else: banner_image.show() if state == self.JINGLE_STATE_CONNECTING: - banner_image.set_from_stock( - Gtk.STOCK_CONVERT, 1) + banner_image.set_from_icon_name( + Gtk.STOCK_CONVERT, Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTION_RECEIVED: - banner_image.set_from_stock( - Gtk.STOCK_NETWORK, 1) + banner_image.set_from_icon_name( + "network-workgroup", Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_CONNECTED: - banner_image.set_from_stock( - Gtk.STOCK_CONNECT, 1) + banner_image.set_from_icon_name( + Gtk.STOCK_CONNECT, Gtk.IconSize.MENU) elif state == self.JINGLE_STATE_ERROR: - banner_image.set_from_stock( - Gtk.STOCK_DIALOG_WARNING, 1) + banner_image.set_from_icon_name( + "dialog-warning", Gtk.IconSize.MENU) self.update_toolbar() def update_audio(self): ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2443,7 +2443,7 @@ class AccountCreationWizardWindow: self.go_online_checkbutton.show() img = self.xml.get_object('finish_image') if self.modify: - img.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) + img.set_from_icon_name(Gtk.STOCK_APPLY, Gtk.IconSize.DIALOG) else: path_to_file = gtkgui_helpers.get_icon_path('org.gajim.Gajim', 48) img.set_from_file(path_to_file) @@ -2701,7 +2701,7 @@ class AccountCreationWizardWindow: self.go_online_checkbutton.hide() self.show_vcard_checkbutton.hide() img = self.xml.get_object('finish_image') - img.set_from_stock(Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.DIALOG) + img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % ( _('An error occurred during account creation'), obj.reason) self.finish_label.set_markup(finish_text) @@ -2735,7 +2735,7 @@ class AccountCreationWizardWindow: if self.account in app.config.get_per('accounts'): app.config.del_per('accounts', self.account) img = self.xml.get_object('finish_image') - img.set_from_stock(Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.DIALOG) + img.set_from_icon_name("dialog-error", Gtk.IconSize.DIALOG) finish_text = '<big><b>%s</b></big>\n\n%s' % (_( 'An error occurred during account creation'), obj.reason) self.finish_label.set_markup(finish_text) ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -891,7 +891,7 @@ class AgentBrowser: self.browse_button = Gtk.Button() self.browse_button.connect('clicked', self.on_browse_button_clicked) self.window.action_buttonbox.add(self.browse_button) - image = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON) + image = Gtk.Image.new_from_icon_name("document-open", Gtk.IconSize.BUTTON) self.browse_button.set_image(image) label = _('Browse') self.browse_button.set_label(label) @@ -1299,7 +1299,7 @@ class ToplevelAgentBrowser(AgentBrowser): self.execute_button = Gtk.Button() self.execute_button.connect('clicked', self.on_execute_button_clicked) self.window.action_buttonbox.add(self.execute_button) - image = Gtk.Image.new_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON) + image = Gtk.Image.new_from_icon_name("system-run", Gtk.IconSize.BUTTON) self.execute_button.set_image(image) label = _('Execute Command') self.execute_button.set_label(label) @@ -1314,8 +1314,6 @@ class ToplevelAgentBrowser(AgentBrowser): self.join_button = Gtk.Button() self.join_button.connect('clicked', self.on_join_button_clicked) self.window.action_buttonbox.add(self.join_button) - image = Gtk.Image.new_from_stock(Gtk.STOCK_CONNECT, Gtk.IconSize.BUTTON) - self.join_button.set_image(image) label = _('Join') self.join_button.set_label(label) self.join_button.show_all() @@ -1323,7 +1321,7 @@ class ToplevelAgentBrowser(AgentBrowser): self.search_button = Gtk.Button() self.search_button.connect('clicked', self.on_search_button_clicked) self.window.action_buttonbox.add(self.search_button) - image = Gtk.Image.new_from_stock(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON) + image = Gtk.Image.new_from_icon_name("edit-find", Gtk.IconSize.BUTTON) self.search_button.set_image(image) label = _('Search') self.search_button.set_label(label) ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -897,8 +897,8 @@ class FileTransfersWindow: if status: label = _('Pause') self.pause_button.set_label(label) - self.pause_button.set_image(Gtk.Image.new_from_stock( - Gtk.STOCK_MEDIA_PAUSE, Gtk.IconSize.MENU)) + self.pause_button.set_image(Gtk.Image.new_from_icon_name( + "media-playback-pause", Gtk.IconSize.MENU)) self.pause_menuitem.set_sensitive(True) self.pause_menuitem.set_no_show_all(False) @@ -908,8 +908,8 @@ class FileTransfersWindow: else: label = _('_Continue') self.pause_button.set_label(label) - self.pause_button.set_image(Gtk.Image.new_from_stock( - Gtk.STOCK_MEDIA_PLAY, Gtk.IconSize.MENU)) + self.pause_button.set_image(Gtk.Image.new_from_icon_name( + "media-playback-start", Gtk.IconSize.MENU)) self.pause_menuitem.hide() self.pause_menuitem.set_no_show_all(True) self.continue_menuitem.set_sensitive(True) ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -258,7 +258,7 @@ class StatusTable: self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: lock_image = Gtk.Image() - lock_image.set_from_stock(Gtk.STOCK_DIALOG_AUTHENTICATION, + lock_image.set_from_icon_name("dialog-password", Gtk.IconSize.MENU) self.table.attach(lock_image, 4, self.current_row, 1, 1) self.current_row += 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/15aed2a95de32e49f9af71c01caff6ed3… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/15aed2a95de32e49f9af71c01caff6ed3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix Windows build
by Philipp Hörist 26 Sep '17

26 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b9e54cd9 by Philipp Hörist at 2017-09-26T15:34:39+02:00 Fix Windows build - - - - - 15aed2a9 by Philipp Hörist at 2017-09-26T16:48:57+02:00 Merge branch 'master' into 'master' Fix Windows build See merge request !136 - - - - - 9 changed files: - appveyor.yml - − data/pixmaps/gajim.ico - setup.py - win/_base.sh - win/misc/create-launcher.py - win/misc/gajim-portable.nsi - win/misc/gajim.nsi - data/pixmaps/nsis_header.bmp → win/misc/nsis_header.bmp - data/pixmaps/nsis_wizard.bmp → win/misc/nsis_wizard.bmp Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -22,8 +22,8 @@ install: } bash 'pacman -Sy --noconfirm git' - bash 'git clone https://dev.gajim.org/gajim/gajim.git' - + bash 'git clone C:/projects/gajim C:/msys64/home/appveyor/gajim' + - cmd: '%MSYS% C:/msys64/home/appveyor/gajim/win/build.sh' # Ugly workaround, because i found no way to tell when mingw32.exe returns - cmd: timeout 900 ===================================== data/pixmaps/gajim.ico deleted ===================================== Binary files a/data/pixmaps/gajim.ico and /dev/null differ ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -269,7 +269,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'dbus-python', + 'dbus-python;sys_platform=="linux"', 'nbxmpp', 'pyOpenSSL' ], ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -96,14 +96,6 @@ pillow --force-reinstall $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) build_pip install python-axolotl - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-shared-mime-info \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gnome-common || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gsl || true - build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-libvpx || true - # remove the large png icons, they should be used rarely and svg works fine rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/512x512" rm -Rf "${MINGW_ROOT}/share/icons/Adwaita/256x256" @@ -121,62 +113,53 @@ pillow function install_gajim { [ -z "$1" ] && (echo "Missing arg"; exit 1) - rm -Rf "${PACKAGE_DIR}/gajim" - rm -Rf "${REPO_CLONE}" - git clone "${DIR}"/.. "${REPO_CLONE}" - mv "${REPO_CLONE}/gajim" "${PACKAGE_DIR}" + rm -Rf "${PACKAGE_DIR}"/gajim* + + cd .. - (cd "${REPO_CLONE}" && git checkout "$1") || exit 1 + build_pip install . - if [ "$1" = "master" ] - then - local GIT_REV=$(git rev-list --count HEAD) - local GIT_HASH=$(git rev-parse --short HEAD) - QL_VERSION_DESC="QL_VERSION-rev$GIT_REV-$GIT_HASH" - else - QL_VERSION_DESC=$1 - QL_VERSION=$1 - fi + QL_VERSION=$(MSYSTEM= build_python -c \ + "import gajim; import sys; sys.stdout.write(gajim.__version__.split('-')[0])") + + QL_VERSION_DESC=$(MSYSTEM= build_python -c \ + "import gajim; import sys; sys.stdout.write(gajim.__version__)") # Create launchers build_python "${MISC}"/create-launcher.py \ "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install plugin installer - wget -P "${REPO_CLONE}/plugins" -c https://ftp.gajim.org/plugins_1/plugin_installer.zip - 7z x -o"${REPO_CLONE}"/plugins "${REPO_CLONE}"/plugins/plugin_installer.zip - rm -f "${REPO_CLONE}"/plugins/plugin_installer.zip + wget -P "${BUILD_ROOT}" -c https://ftp.gajim.org/plugins_1/plugin_installer.zip + mkdir "${PACKAGE_DIR}"/gajim/data/plugins + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip # Install themes rm -Rf "${MINGW_ROOT}"/etc rm -Rf "${MINGW_ROOT}"/share/themes - mv "${REPO_CLONE}"/win/etc "${MINGW_ROOT}" - mv "${REPO_CLONE}"/win/themes "${MINGW_ROOT}"/share + cp -r win/etc "${MINGW_ROOT}" + cp -r win/themes "${MINGW_ROOT}"/share # Install our own icons rm -Rf "${MINGW_ROOT}/share/icons/hicolor" - mv "${REPO_CLONE}"/icons/hicolor "${MINGW_ROOT}"/share/icons + cp -r gajim/data/icons/hicolor "${MINGW_ROOT}"/share/icons - # we installed our app icons into hicolor + # Update icon cache "${MINGW_ROOT}"/bin/gtk-update-icon-cache-3.0.exe --force \ "${MINGW_ROOT}/share/icons/hicolor" - # Create translation files - for f in "${REPO_CLONE}"/po/*.po; do - fullfilename=$(basename "$f") - filename="${fullfilename%.*}" - directory="${MINGW_ROOT}"/share/locale/"$filename" - if [ ! -d "$directory" ]; then - printf "create dir\n" - mkdir -p "${directory}"/LC_MESSAGES - fi - printf "compile $filename\n" - msgfmt -o "${directory}"/LC_MESSAGES/gajim.mo "$f" - done - } function cleanup_install { + + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-shared-mime-info \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pip mingw-w64-"${ARCH}"-ncurses || true + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tk || true + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-tcl || true + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gnome-common || true + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-gsl || true + build_pacman --noconfirm -Rdd mingw-w64-"${ARCH}"-libvpx || true + #delete translations we don't support for d in "${MINGW_ROOT}"/share/locale/*/LC_MESSAGES; do if [ ! -f "${d}"/gajim.mo ]; then @@ -188,28 +171,6 @@ function cleanup_install { -iregex ".*/(gajim|python|history_manager)[^/]*\\.exe" \ -exec rm -f {} \; - rm -Rf "${REPO_CLONE}"/.git - rm -Rf "${REPO_CLONE}"/.gitlab-ci.yml - rm -Rf "${REPO_CLONE}"/debian - rm -Rf "${REPO_CLONE}"/doc - rm -Rf "${REPO_CLONE}"/m4 - rm -Rf "${REPO_CLONE}"/scripts - rm -Rf "${REPO_CLONE}"/test - rm -Rf "${REPO_CLONE}"/win - rm -Rf "${REPO_CLONE}"/icons - rm -Rf "${REPO_CLONE}"/po - rm -Rf "${REPO_CLONE}"/plugins/acronyms_expander - rm -Rf "${REPO_CLONE}"/plugins/dbus_plugin - rm -Rf "${REPO_CLONE}"/plugins/events_dump - rm -Rf "${REPO_CLONE}"/plugins/new_events_example - rm -Rf "${REPO_CLONE}"/plugins/roster_buttons - - rm -Rf "${REPO_CLONE}"/data/emoticons/noto-emoticons/png - rm -Rf "${REPO_CLONE}"/data/emoticons/noto-emoticons/README.md - - find "${REPO_CLONE}"/* -maxdepth 0 -type f ! -regex ".*/$AUTHORS\|COPYING\|THANKS\|THANKS.artists$" -exec rm -f {} \; - find "${REPO_CLONE}"/data/* -maxdepth 0 -type f -exec rm -f {} \; - rm -Rf "${MINGW_ROOT}"/libexec rm -Rf "${MINGW_ROOT}"/share/gtk-doc rm -Rf "${MINGW_ROOT}"/include @@ -258,7 +219,6 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/lib/tcl8 rm -Rf "${MINGW_ROOT}"/lib/tcl8.6 - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstvpx.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdaala.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdvdread.dll @@ -316,6 +276,8 @@ function cleanup_install { find "${MINGW_ROOT}"/bin -name "*.pyo" -exec rm -f {} \; find "${MINGW_ROOT}"/bin -name "*.pyc" -exec rm -f {} \; + # This file is not able to compile because of syntax errors + find "${MINGW_ROOT}"/bin -name "glib-gettextize-script.py" -exec rm -f {} \; build_compileall -q "${MINGW_ROOT}" find "${MINGW_ROOT}" -name "*.py" ! -name "*theme.py" -exec rm -f {} \; find "${MINGW_ROOT}"/bin -name "*.pyc" -exec rm -f {} \; ===================================== win/misc/create-launcher.py ===================================== --- a/win/misc/create-launcher.py +++ b/win/misc/create-launcher.py @@ -89,7 +89,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PySys_SetArgvEx(__argc, szArglist, 0); result = PyRun_SimpleString("import sys; import os;" "sys.frozen=True;" - "os.chdir('../gajim');" "import gajim.gajim as g;" "g.GajimApplication().run(sys.argv);"); Py_Finalize(); ===================================== win/misc/gajim-portable.nsi ===================================== --- a/win/misc/gajim-portable.nsi +++ b/win/misc/gajim-portable.nsi @@ -15,14 +15,14 @@ RequestExecutionLevel user !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_header.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_wizard.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_wizard.bmp" +!define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "mingw32\gajim\COPYING" +!insertmacro MUI_PAGE_LICENSE "..\..\COPYING" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES ===================================== win/misc/gajim.nsi ===================================== --- a/win/misc/gajim.nsi +++ b/win/misc/gajim.nsi @@ -19,15 +19,15 @@ Var StartMenuFolder !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_header.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_wizard.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "mingw32\gajim\data\pixmaps\nsis_wizard.bmp" +!define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" ;!define MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "mingw32\gajim\COPYING" +!insertmacro MUI_PAGE_LICENSE "..\..\COPYING" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" ===================================== data/pixmaps/nsis_header.bmp → win/misc/nsis_header.bmp ===================================== Binary files a/data/pixmaps/nsis_header.bmp and b/win/misc/nsis_header.bmp differ ===================================== data/pixmaps/nsis_wizard.bmp → win/misc/nsis_wizard.bmp ===================================== Binary files a/data/pixmaps/nsis_wizard.bmp and b/win/misc/nsis_wizard.bmp differ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3e764c3d3500df483e21781afb06ccc14… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3e764c3d3500df483e21781afb06ccc14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix some logging calls
by Philipp Hörist 26 Sep '17

26 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e764c3d by Philipp Hörist at 2017-09-26T07:14:01+02:00 Fix some logging calls - Add logging domain to some modules - Log to module domain instead of generic 'gajim' - - - - - 7 changed files: - gajim/common/connection.py - gajim/common/dbus_support.py - gajim/common/sleepy.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/conversation_textview.py - gajim/gui_interface.py - gajim/profile_window.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1473,7 +1473,7 @@ class Connection(CommonConnection, ConnectionHandlers): if not app.config.get_per('accounts', self.name, 'savepass'): # Forget password, it's wrong self.password = None - app.log.debug("Couldn't authenticate to %s" % self._hostname) + log.debug("Couldn't authenticate to %s" % self._hostname) self.disconnect(on_purpose = True) app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -25,12 +25,15 @@ ## import os +import logging from gajim.common import app from gajim.common import exceptions _GAJIM_ERROR_IFACE = 'org.gajim.dbus.Error' +log = logging.getLogger('gajim.c.dbus') + try: import dbus from dbus.mainloop.glib import DBusGMainLoop @@ -155,7 +158,7 @@ def get_interface(interface, path, start_service=True): obj = bus.get_object(interface, path) return dbus.Interface(obj, interface) except Exception as e: - app.log.debug(str(e)) + log.debug(str(e)) return None ===================================== gajim/common/sleepy.py ===================================== --- a/gajim/common/sleepy.py +++ b/gajim/common/sleepy.py @@ -23,6 +23,9 @@ from gajim.common import app import os +import logging + +log = logging.getLogger('gajim.c.sleepy') STATE_UNKNOWN = 'OS probably not supported' @@ -52,7 +55,7 @@ try: from gajim.common import idle idle.xss_available except Exception: - app.log.debug('Unable to load idle module') + log.debug('Unable to load idle module') SUPPORTED = False class SleepyWindows: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -20,8 +20,11 @@ from gajim.common import app import select import re +import logging from gajim.common.zeroconf.zeroconf import Constant +log = logging.getLogger('gajim.c.z.zeroconf_bonjour') + try: import pybonjour except ImportError: @@ -56,7 +59,7 @@ class Zeroconf: def browse_callback(self, sdRef, flags, interfaceIndex, errorCode, serviceName, regtype, replyDomain): - app.log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) + log.debug('Found service %s in domain %s on %i(type: %s).' % (serviceName, replyDomain, interfaceIndex, regtype)) if not self.connected: return if errorCode != pybonjour.kDNSServiceErr_NoError: @@ -72,7 +75,7 @@ class Zeroconf: while not self.resolved: ready = select.select([resolve_sdRef], [], [], resolve_timeout) if resolve_sdRef not in ready[0]: - app.log.debug('Resolve timed out') + log.debug('Resolve timed out') break pybonjour.DNSServiceProcessResult(resolve_sdRef) else: @@ -81,7 +84,7 @@ class Zeroconf: resolve_sdRef.close() def remove_service_callback(self, name): - app.log.debug('Service %s disappeared.' % name) + log.debug('Service %s disappeared.' % name) if not self.connected: return if name != self.name: @@ -121,8 +124,8 @@ class Zeroconf: txt = pybonjour.TXTRecord.parse(txtRecord) - app.log.debug('Service data for service %s on %i:' % (fullname, interfaceIndex)) - app.log.debug('Host %s, port %i, TXT data: %s' % (hosttarget, port, txt._items)) + log.debug('Service data for service %s on %i:' % (fullname, interfaceIndex)) + log.debug('Host %s, port %i, TXT data: %s' % (hosttarget, port, txt._items)) if not self.connected: return @@ -176,11 +179,11 @@ class Zeroconf: def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain): if errorCode == pybonjour.kDNSServiceErr_NoError: - app.log.debug('Service successfully added') + log.debug('Service successfully added') def service_add_fail_callback(self, err): if err[0][0] == pybonjour.kDNSServiceErr_NameConflict: - app.log.debug('Error while adding service. %s' % str(err)) + log.debug('Error while adding service. %s' % str(err)) parts = self.username.split(' ') #check if last part is a number and if, increment it @@ -230,7 +233,7 @@ class Zeroconf: except pybonjour.BonjourError as e: self.service_add_fail_callback(e) else: - app.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) + log.debug('Publishing service %s of type %s' % (self.name, self.stype)) ready = select.select([sdRef], [], [], resolve_timeout) if sdRef in ready[0]: @@ -252,7 +255,7 @@ class Zeroconf: self.announced = False return True except pybonjour.BonjourError as e: - app.log.debug(e) + log.debug(e) return False @@ -282,7 +285,7 @@ class Zeroconf: self.remove_announce() def browse_domain(self, domain=None): - app.log.debug('starting to browse') + log.debug('starting to browse') try: self.browse_sdRef = pybonjour.DNSServiceBrowse(regtype=self.stype, domain=domain, callBack=self.browse_callback) except pybonjour.BonjourError as e: @@ -310,7 +313,7 @@ class Zeroconf: try: ready = select.select([resolve_sdRef], [], [], resolve_timeout) if resolve_sdRef not in ready[0]: - app.log.debug('Resolve timed out (in resolve_all)') + log.debug('Resolve timed out (in resolve_all)') break pybonjour.DNSServiceProcessResult(resolve_sdRef) finally: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -1358,8 +1358,8 @@ class ConversationTextview(GObject.GObject): self.tv.display_html(xhtml, self.tv, self, iter_=iter_) return except Exception as e: - app.log.debug('Error processing xhtml: ' + str(e)) - app.log.debug('with |' + xhtml + '|') + log.debug('Error processing xhtml: ' + str(e)) + log.debug('with |' + xhtml + '|') # /me is replaced by name if name is given if name and (text.startswith('/me ') or text.startswith('/me\n')): ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2362,7 +2362,7 @@ class Interface: if pixbuf is None: return if typ not in ('jpeg', 'png'): - app.log.info('gtkpixbuf cannot save other than jpeg and '\ + log.info('gtkpixbuf cannot save other than jpeg and '\ 'png formats. saving \'%s\' avatar as png file (originaly: %s)'\ % (jid, typ)) typ = 'png' ===================================== gajim/profile_window.py ===================================== --- a/gajim/profile_window.py +++ b/gajim/profile_window.py @@ -31,6 +31,7 @@ import base64 import mimetypes import os import time +import logging from gajim import gtkgui_helpers from gajim import dialogs @@ -39,6 +40,7 @@ from gajim import vcard from gajim.common import app from gajim.common import ged +log = logging.getLogger('gajim.profile') class ProfileWindow: """ @@ -181,7 +183,7 @@ class ProfileWindow: try: os.remove(path_to_file) except OSError: - app.log.debug('Cannot remove %s' % path_to_file) + log.debug('Cannot remove %s' % path_to_file) def on_clear(widget): self.dialog.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e764c3d3500df483e21781afb06ccc14d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e764c3d3500df483e21781afb06ccc14d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-0.6.0
by Yann Leboulanger 25 Sep '17

25 Sep '17

Yann Leboulanger pushed new tag nbxmpp-0.6.0 at gajim / python-nbxmpp --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/tree/nbxmpp-0.6.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Update Version of setup.py
by Philipp Hörist 25 Sep '17

25 Sep '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b9fa37be by Philipp Hörist at 2017-09-25T15:00:30+02:00 Update Version of setup.py - - - - - 1 changed file: - setup.py Changes: ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.5.7', + version='0.6.0', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b9fa37be8d6bcb7296926a755d… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b9fa37be8d6bcb7296926a755d… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2017