Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix error when plugin cant be loaded
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 08fe2326 by Philipp Hörist at 2018-10-25T19:20:38Z Fix error when plugin cant be loaded Fixes #9403 - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -163,6 +163,8 @@ class PluginManager(metaclass=Singleton): if activate: pc = self.scan_dir_for_plugins(dst_dir, scan_dirs=True, package=True) + if not pc: + continue self.add_plugin(pc[0]) plugin = self.plugins[-1] self.activate_plugin(plugin) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08fe232695f3118014659ffa80f8906577… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/08fe232695f3118014659ffa80f8906577… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update feature list in appdata.xml
by Philipp Hörist 25 Oct '18

25 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3dcd6323 by Daniel Brötzmann at 2018-10-25T09:59:41Z Update feature list in appdata.xml - - - - - 2 changed files: - .gitlab-ci.yml - data/org.gajim.Gajim.appdata.xml.in Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,6 +24,11 @@ run-pylint: - pylint --version - scripts/dev/pylint-ci.sh --jobs=2 gajim +run-appdata: + stage: test + script: + - appstream-util validate data/org.gajim.Gajim.appdata.xml.in + run-build: stage: build script: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -7,32 +7,37 @@ <metadata_license>CC-BY-SA-3.0</metadata_license> <project_license>GPL-3.0</project_license> <name>Gajim</name> - <summary>A GTK+ Jabber client</summary> + <summary>A GTK+ XMPP client</summary> <description> - <p>Gajim is a chat client to be used with Jabber.org, Live Journal Talk, - Nimbuzz, Ovi, Talkonaut, and thousands of other services - run by companies and ISPs, and volunteers around the world. + <p>Gajim aims to be an easy to use and fully-featured XMPP client. + With Gajim you can chat through various XMPP services of your choice + (e.g. Jabber.org) as well as transports (e.g. Facebook, IRC). </p> - <p>If you have a few accounts on different servers, if you want to be in - contact with your friends and family all the time, then Gajim is for you. + <p>Just chat with your friends or family, easily share pictures and + thoughts or discuss the news with your groups. + </p> + <p>Gajim integrates well with your other devices: just chat and see what's + been said on your mobile device. </p> <p>Features:</p> <ul> - <li>Tabbed chat window and single window modes</li> - <li>Group chat support (with Multi-User Chat protocol), invitation, chat to group chat transformation</li> - <li>Emojis, avatars, PEP (user activity, mood and tune)</li> - <li>Audio / video conferences</li> - <li>File transfer, room bookmarks</li> - <li>Metacontacts support</li> - <li>Trayicon, speller, extended chat history functionalities</li> - <li>TLS, GPG and End-To-End encryption support</li> - <li>Transport registration support</li> - <li>Service discovery including nodes, user search</li> - <li>Wikipedia, dictionary and search engine lookup</li> - <li>Multiple accounts support</li> - <li>XML console interface</li> - <li>Link local (bonjour / zeroconf), BOSH</li> - <li>Other features via plugins </li> + <li>Never miss a message, keep all your chat clients synchronized</li> + <li>Invite friends to group chats or join one</li> + <li>Easily send pictures, videos or other files to friends and groups</li> + <li>Chat securely with End-to-End encryption via OMEMO or PGP</li> + <li>Use your favorite emoticons, set your own profile picture</li> + <li>Keep and manage all your chat history</li> + <li>Organize your chats with tabs</li> + <li>Automatic spell-checking for your messages</li> + <li>Connect to other Messengers via Transports (Facebook, IRC, ...)</li> + <li>Lookup things on Wikipedia, dictionaries or other search engines directly from the chat window</li> + <li>Set your activity, tune, and mood to show your friends how you are feeling</li> + <li>Support for multiple accounts</li> + <li>Group multiple contacts from one friend to a single Meta-Contact</li> + <li>XML console to see what's happening on the protocol layer</li> + <li>Serverless messaging (Bonjour/Zeroconf), BOSH</li> + <li>Support for service discovery including nodes and search for users</li> + <li>Even more features via plugins</li> </ul> </description> <categories> @@ -43,7 +48,7 @@ </categories> <screenshots> <screenshot type="default"> - <image>https://gajim.org/imgs/gajim_roster.png</image> + <image>https://gajim.org/imgs/gajim_single_window_mode.png</image> <caption>Roster, list of contacts</caption> </screenshot> <screenshot> @@ -69,7 +74,7 @@ <url type="homepage">https://gajim.org/</url> <url type="bugtracker">https://dev.gajim.org/gajim/gajim</url> <url type="faq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</url> - <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/home</url> + <url type="help">https://dev.gajim.org/gajim/gajim/wikis/help/Help</url> <url type="donation">https://gajim.org/dev.php#donate</url> <url type="translate">https://dev.gajim.org/gajim/gajim/wikis/development/DevTranslate</url> <translation type="gettext">gajim</translation> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dcd6323d297ca5a779c0f0c0a443a385d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3dcd6323d297ca5a779c0f0c0a443a385d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint error
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1cc8c57 by Philipp Hörist at 2018-10-24T22:06:45Z Fix pylint error - - - - - d7ea69f3 by Philipp Hörist at 2018-10-24T22:12:28Z Refactor StatusIcon - Move to gtk folder - Rename some handlers - Use get_builder - - - - - 3 changed files: - gajim/gtk/profile.py - gajim/statusicon.py → gajim/gtk/statusicon.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -161,7 +161,7 @@ class ProfileWindow(Gtk.ApplicationWindow): if self.avatar_sha is None: return show_save_as_menu(self.avatar_sha, nick) - + elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) ===================================== gajim/statusicon.py → gajim/gtk/statusicon.py ===================================== @@ -22,7 +22,6 @@ import os from gi.repository import Gtk -from gi.repository import Gdk from gajim import dialogs from gajim import tooltips @@ -30,6 +29,7 @@ from gajim import gtkgui_helpers from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ +from gajim.gtk.util import get_builder from gajim.gtk.single_message import SingleMessageWindow @@ -45,9 +45,9 @@ class StatusIcon: # click somewhere else does not popdown menu. workaround this. self.added_hide_menuitem = False self.status = 'offline' - self.xml = gtkgui_helpers.get_gtk_builder('systray_context_menu.ui') - self.systray_context_menu = self.xml.get_object('systray_context_menu') - self.xml.connect_signals(self) + self._ui = get_builder('systray_context_menu.ui') + self.systray_context_menu = self._ui.systray_context_menu + self._ui.connect_signals(self) self.popup_menus = [] self.status_icon = None self.tooltip = tooltips.NotificationAreaTooltip() @@ -83,21 +83,15 @@ class StatusIcon: if not self.status_icon: self.status_icon = Gtk.StatusIcon() self.status_icon.set_property('has-tooltip', True) - self.status_icon.connect('activate', - self.on_status_icon_left_clicked) - self.status_icon.connect('popup-menu', - self.on_status_icon_right_clicked) - self.status_icon.connect('query-tooltip', - self.on_status_icon_query_tooltip) + self.status_icon.connect('activate', self._on_activate) + self.status_icon.connect('popup-menu', self._on_popup_menu) + self.status_icon.connect('query-tooltip', self._on_query_tooltip) self.status_icon.connect('size-changed', self.set_img) self.set_img() self.subscribe_events() - def on_status_icon_right_clicked(self, widget, event_button, event_time): - self.make_menu(event_button, event_time) - - def on_status_icon_query_tooltip(self, widget, x, y, keyboard_mode, tooltip): + def _on_query_tooltip(self, _status_icon, _x, _y, _keyboard_mode, tooltip): tooltip.set_custom(self.tooltip.get_tooltip()) return True @@ -105,7 +99,15 @@ class StatusIcon: self.status_icon.set_visible(False) self.unsubscribe_events() - def on_status_icon_left_clicked(self, widget): + def _on_popup_menu(self, _status_icon, button, activate_time): + if button == 1: # Left click + self.on_left_click() + elif button == 2: # middle click + self.on_middle_click() + elif button == 3: # right click + self.make_menu(button, activate_time) + + def _on_activate(self, _status_icon): self.on_left_click() def on_status_icon_size_changed(self, statusicon, size): @@ -173,13 +175,12 @@ class StatusIcon: for m in self.popup_menus: m.destroy() - chat_with_menuitem = self.xml.get_object('chat_with_menuitem') - single_message_menuitem = self.xml.get_object( - 'single_message_menuitem') - status_menuitem = self.xml.get_object('status_menu') - join_gc_menuitem = self.xml.get_object('join_gc_menuitem') - sounds_mute_menuitem = self.xml.get_object('sounds_mute_menuitem') - show_roster_menuitem = self.xml.get_object('show_roster_menuitem') + chat_with_menuitem = self._ui.chat_with_menuitem + single_message_menuitem = self._ui.single_message_menuitem + status_menuitem = self._ui.status_menu + join_gc_menuitem = self._ui.join_gc_menuitem + sounds_mute_menuitem = self._ui.sounds_mute_menuitem + show_roster_menuitem = self._ui.show_roster_menuitem if self.single_message_handler_id: single_message_menuitem.handler_disconnect( @@ -412,17 +413,6 @@ class StatusIcon: else: win.present() - def on_clicked(self, widget, event): - self.on_tray_leave_notify_event(widget, None) - if event.type_ != Gdk.EventType.BUTTON_PRESS: - return - if event.button == 1: # Left click - self.on_left_click() - elif event.button == 2: # middle click - self.on_middle_click() - elif event.button == 3: # right click - self.make_menu(event.button, event.time) - def on_show_menuitem_activate(self, widget, show): # we all add some fake (we cannot select those nor have them as show) # but this helps to align with roster's status_combobox index positions ===================================== gajim/gui_interface.py ===================================== @@ -2737,7 +2737,7 @@ class Interface: self.systray_enabled = False - from gajim import statusicon + from gajim.gtk import statusicon self.systray = statusicon.StatusIcon() pixs = [] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c08f752d8981ae06155fcb3dac3938fae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c08f752d8981ae06155fcb3dac3938fae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor "Save as" menu
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c08f752d by Philipp Hörist at 2018-10-24T21:42:07Z Refactor "Save as" menu - - - - - 4 changed files: - gajim/chat_control.py - gajim/gtk/profile.py - gajim/gui_menu_builder.py - gajim/vcard.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -568,8 +568,6 @@ class ChatControl(ChatControlBase): If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) if self.TYPE_ID == message_control.TYPE_CHAT: sha = app.contacts.get_avatar_sha( self.account, self.contact.jid) @@ -577,16 +575,7 @@ class ChatControl(ChatControlBase): else: sha = self.gc_contact.avatar_sha name = self.gc_contact.get_shown_name() - id_ = menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) - self.handlers[id_] = menuitem - menu.append(menuitem) - menu.show_all() - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + gui_menu_builder.show_save_as_menu(sha, name) return True def on_location_eventbox_button_release_event(self, widget, event): ===================================== gajim/gtk/profile.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim import gtkgui_helpers +from gajim.gui_menu_builder import show_save_as_menu from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog @@ -154,25 +155,13 @@ class ProfileWindow(Gtk.ApplicationWindow): """ If right-clicked, show popup """ - if event.button == 3: # right click - menu = Gtk.Menu() - nick = app.config.get_per('accounts', self.account, 'name') if self.avatar_sha is None: return - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect( - 'activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.avatar_sha, nick) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(self.avatar_sha, nick) + elif event.button == 1: # left click self.on_set_avatar_button_clicked(widget) ===================================== gajim/gui_menu_builder.py ===================================== @@ -596,6 +596,18 @@ def get_transport_menu(contact, account): return menu +def show_save_as_menu(sha, name): + menu = Gtk.Menu() + menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) + menuitem.connect( + 'activate', + gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) + menu.append(menuitem) + menu.connect('selection-done', lambda w: w.destroy()) + menu.show_all() + menu.popup_at_pointer() + + def get_singlechat_menu(control_id): singlechat_menu = [ (_('Send File…'), [ ===================================== gajim/vcard.py ===================================== @@ -34,6 +34,7 @@ from gi.repository import GLib from gi.repository import Gdk from gajim import gtkgui_helpers +from gajim.gui_menu_builder import show_save_as_menu from gajim.common import helpers from gajim.common import app from gajim.common import ged @@ -160,8 +161,6 @@ class VcardWindow: If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) if self.gc_contact: sha = self.gc_contact.avatar_sha name = self.gc_contact.get_shown_name() @@ -171,14 +170,7 @@ class VcardWindow: name = self.contact.get_shown_name() if sha is None: sha = self.avatar - menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, sha, name) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(sha, name) def set_value(self, entry_name, value): try: @@ -512,17 +504,8 @@ class ZeroconfVcardWindow: If right-clicked, show popup """ if event.button == 3: # right click - menu = Gtk.Menu() - menuitem = Gtk.MenuItem.new_with_mnemonic(_('Save _As')) - menuitem.connect('activate', - gtkgui_helpers.on_avatar_save_as_menuitem_activate, - self.contact.avatar_sha, self.contact.get_shown_name()) - menu.append(menuitem) - menu.connect('selection-done', lambda w: w.destroy()) - # show the menu - menu.show_all() - menu.attach_to_widget(widget, None) - menu.popup(None, None, None, None, event.button, event.time) + show_save_as_menu(self.contact.avatar_sha, + self.contact.get_shown_name()) def set_value(self, entry_name, value): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c08f752d8981ae06155fcb3dac3938fae9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c08f752d8981ae06155fcb3dac3938fae9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use keyword init for Labels
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c6b2e0b by Philipp Hörist at 2018-10-24T21:04:14Z Use keyword init for Labels keyword-less init is deprecated - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -396,7 +396,7 @@ class Account(Gtk.Box): self.options = AccountPage(account, parent) self.parent = parent - self.label = Gtk.Label(app.get_account_label(account)) + self.label = Gtk.Label(label=app.get_account_label(account)) self.label.set_halign(Gtk.Align.START) self.label.set_hexpand(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c6b2e0bb4b47de4cd95de436ed2958954… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c6b2e0bb4b47de4cd95de436ed2958954… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint error
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 974b3513 by Philipp Hörist at 2018-10-24T19:16:13Z Fix pylint error - - - - - 1 changed file: - gajim/gtk/exception.py Changes: ===================================== gajim/gtk/exception.py ===================================== @@ -101,7 +101,7 @@ class ExceptionDialog(): Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, GLib.glib_version)) + glib_ver = '.'.join(map(str, GLib.glib_version)) return ISSUE_TEXT.format(get_os_info(), gtk_ver, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/974b351338970ca685846c1257aa2f646b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/974b351338970ca685846c1257aa2f646b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Improve ExceptionDialog
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e2a9c72 by Philipp Hörist at 2018-10-24T19:14:54Z Improve ExceptionDialog - Move to gtk module - Use get_builder() so translation works - Add GLib version - Remove standalone testing code - - - - - 3 changed files: - gajim/data/gui/exception_dialog.ui - gajim/gajim.py - gajim/gtkexcepthook.py → gajim/gtk/exception.py Changes: ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -2,7 +2,7 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkApplicationWindow" id="ExceptionDialog"> + <object class="GtkApplicationWindow" id="exception_dialog"> <property name="can_focus">False</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> ===================================== gajim/gajim.py ===================================== @@ -67,8 +67,8 @@ def _init_gtk(): 'Quitting...' % _MIN_GTK_VER) sys.exit(1) - from gajim import gtkexcepthook - gtkexcepthook.init() + from gajim.gtk import exception + exception.init() i18n.initialize_direction_mark() ===================================== gajim/gtkexcepthook.py → gajim/gtk/exception.py ===================================== @@ -23,25 +23,19 @@ import traceback import threading import webbrowser import platform +from pathlib import Path from io import StringIO from urllib.parse import urlencode -import nbxmpp -from gi.repository import Gtk, GObject +from gi.repository import Gtk +from gi.repository import GObject +from gi.repository import GLib -try: - import gajim - gajim_version = gajim.__version__ -except ImportError: - # For standalone testing - gajim_version = 'Package not installed' +import nbxmpp -if __name__ == '__main__': - glade_file = os.path.join('data', 'gui', 'exception_dialog.ui') -else: - from gajim.common import configpaths - gui_path = configpaths.get('GUI') - glade_file = os.path.join(gui_path, 'exception_dialog.ui') +import gajim +from gajim.common import configpaths +from gajim.gtk.util import get_builder _exception_in_progress = threading.Lock() @@ -50,6 +44,7 @@ ISSUE_TEXT = '''## Versions - OS: {} - GTK+ Version: {} - PyGObject Version: {} +- GLib Version : {} - python-nbxmpp Version: {} - Gajim Version: {} @@ -74,22 +69,21 @@ def _hook(type_, value, tb): class ExceptionDialog(): def __init__(self, type_, value, tb): - builder = Gtk.Builder() - builder.add_from_file(glade_file) - self.dialog = builder.get_object("ExceptionDialog") - builder.connect_signals(self) - builder.get_object("report_btn").grab_focus() - self.exception_view = builder.get_object("exception_view") - buffer_ = self.exception_view.get_buffer() + path = Path(configpaths.get('GUI')) / 'exception_dialog.ui' + self._ui = get_builder(path.resolve()) + self._ui.connect_signals(self) + + self._ui.report_btn.grab_focus() + + buffer_ = self._ui.exception_view.get_buffer() trace = StringIO() traceback.print_exception(type_, value, tb, None, trace) self.text = self.get_issue_text(trace.getvalue()) buffer_.set_text(self.text) print(self.text) - self.exception_view.set_editable(False) - self.dialog.show() - if __name__ == '__main__': - self.dialog.connect('delete-event', self._on_delete_event) + + self._ui.exception_view.set_editable(False) + self._ui.exception_dialog.show() def on_report_clicked(self, *args): issue_url = 'https://dev.gajim.org/gajim/gajim/issues/new' @@ -98,25 +92,23 @@ class ExceptionDialog(): webbrowser.open(url, new=2) def on_close_clicked(self, *args): - self.dialog.destroy() - if __name__ == '__main__': - Gtk.main_quit() - - def _on_delete_event(self, *args): - Gtk.main_quit() + self._ui.exception_dialog.destroy() - def get_issue_text(self, traceback_text): + @staticmethod + def get_issue_text(traceback_text): gtk_ver = '%i.%i.%i' % ( Gtk.get_major_version(), Gtk.get_minor_version(), Gtk.get_micro_version()) gobject_ver = '.'.join(map(str, GObject.pygobject_version)) + glib_ver = '.'.join(map(str, GLib.glib_version)) return ISSUE_TEXT.format(get_os_info(), gtk_ver, gobject_ver, + glib_ver, nbxmpp.__version__, - gajim_version, + gajim.__version__, traceback_text) @@ -135,11 +127,3 @@ def get_os_info(): except ImportError: return platform.system() return '' - - -# this is just to assist testing (python3 gtkexcepthook.py) -if __name__ == '__main__': - init() - print(sys.version) - ExceptionDialog(None, None, None) - Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e2a9c724f4afa7080fcb3678429cfe802… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0e2a9c724f4afa7080fcb3678429cfe802… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ExceptionDialog GUI
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 79a37f69 by Daniel Brötzmann at 2018-10-24T18:41:16Z Update ExceptionDialog GUI - - - - - 1 changed file: - gajim/data/gui/exception_dialog.ui Changes: ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -1,29 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkApplicationWindow" id="ExceptionDialog"> <property name="can_focus">False</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> - <object class="GtkGrid" id="grid"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">20</property> - <property name="column_spacing">20</property> + <property name="spacing">12</property> <child> - <object class="GtkImage" id="image"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> @@ -31,59 +30,61 @@ <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="msglabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes">A programming error has been detected. It probably is not fatal, but should be reported to the developers nonetheless.</property> - <property name="wrap">True</property> - <property name="max_width_chars">60</property> - <property name="lines">3</property> - <attributes> - <attribute name="font-desc" value="<Geben Sie den Wert ein> 12"/> - </attributes> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow"> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkTextView" id="exception_view"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="editable">False</property> - <property name="left_margin">4</property> - <property name="right_margin">4</property> - <property name="accepts_tab">False</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Sorry, that should not have happened</property> + <style> + <class name="large-header"/> + <class name="dim-label"/> + </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Gajim encountered an error. A report is shown below. +By reporting this bug you might help people to fix this.</property> + <property name="wrap">True</property> + <property name="max_width_chars">60</property> + <property name="lines">3</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -112,11 +113,15 @@ </child> <child> <object class="GtkButton" id="report_btn"> - <property name="label" translatable="yes">Report Bug</property> + <property name="label" translatable="yes">_Report Bug</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_report_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">True</property> @@ -132,10 +137,33 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow"> + <property name="height_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="exception_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="left_margin">4</property> + <property name="right_margin">4</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> </child> - <child> - <placeholder/> - </child> </object> </interface> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79a37f6992acc2adb21b04549860eaaf11… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/79a37f6992acc2adb21b04549860eaaf11… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Update ChangeLog
by Philipp Hörist 24 Oct '18

24 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 6b63d91f by Philipp Hörist at 2018-10-24T17:09:54Z Update ChangeLog - - - - - 060332e3 by Philipp Hörist at 2018-10-24T17:10:22Z Windows: Add folder to DLL search This makes python look into the `bin` folder when searching for DLLs before it trys C:\Windows or C:\Windows\system32 and potentially finds other versions of DLLs Fixes #8968 - - - - - 4a812dce by Philipp Hörist at 2018-10-24T17:10:22Z Fix Windows build Appveyor adds ssl libs to the system folder which trips pythons ssl module see https://github.com/appveyor/ci/issues/2571 - - - - - 3 changed files: - ChangeLog - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,18 @@ -Gajim 1.0.99.1 (13 October 2018) +Gajim 1.1.0 (TBA) + + New + + * Remove support for XEP-0091 + + Bug fixes + + * 9322 Error when adding contact + * 9385 Ignore invalid bookmarks + * 9386 Discovery: Browsing nodes without identity + * 9393 Error when parsing invalid timestamps + * 9398 Error on jingle file transfer + +Gajim 1.0.99.1 (07 October 2018) New ===================================== appveyor.yml ===================================== @@ -18,6 +18,8 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: + - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll + - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== win/misc/create-launcher.py ===================================== @@ -87,10 +87,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - result = PyRun_SimpleString("import sys; import os;" - "sys.frozen=True;" - "from gajim import gajim;" - "gajim.main();"); + result = PyRun_SimpleString( + "import sys; import os;" + "sys.frozen=True;" + "from pathlib import Path;" + "root_path = Path(sys.executable).parents[1];" + "from ctypes import windll;" + "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));" + "from gajim import gajim;" + "gajim.main();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3db2138e34f2380e65182d49d08ca25b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Windows: Add folder to DLL search
by Philipp Hörist 23 Oct '18

23 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fe21ae60 by Philipp Hörist at 2018-10-23T20:58:49Z Windows: Add folder to DLL search This makes python look into the `bin` folder when searching for DLLs before it trys C:\Windows or C:\Windows\system32 and potentially finds other versions of DLLs Fixes #8968 - - - - - 9184c66e by Philipp Hörist at 2018-10-23T21:27:02Z Fix Windows build Appveyor adds ssl libs to the system folder which trips pythons ssl module see https://github.com/appveyor/ci/issues/2571 - - - - - 2 changed files: - appveyor.yml - win/misc/create-launcher.py Changes: ===================================== appveyor.yml ===================================== @@ -18,6 +18,8 @@ clone_depth: 1 # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) build_script: + - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll + - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== win/misc/create-launcher.py ===================================== @@ -87,10 +87,15 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - result = PyRun_SimpleString("import sys; import os;" - "sys.frozen=True;" - "from gajim import gajim;" - "gajim.main();"); + result = PyRun_SimpleString( + "import sys; import os;" + "sys.frozen=True;" + "from pathlib import Path;" + "root_path = Path(sys.executable).parents[1];" + "from ctypes import windll;" + "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));" + "from gajim import gajim;" + "gajim.main();"); Py_Finalize(); return result; } View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96653762474aa9ec05499bb8e3fe90721… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/96653762474aa9ec05499bb8e3fe90721… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits