Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix a test. Fixes #8660
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 0d3ce37b by Yann Leboulanger at 2017-06-14T20:25:06+02:00 fix a test. Fixes #8660 - - - - - 1 changed file: - test/lib/gajim_mocks.py Changes: ===================================== test/lib/gajim_mocks.py ===================================== --- a/test/lib/gajim_mocks.py +++ b/test/lib/gajim_mocks.py @@ -24,6 +24,7 @@ class MockConnection(Mock, ConnectionHandlers): self.blocked_groups = {} self.sessions = {} self.nested_group_delimiter = '::' + self.server_resource = 'Gajim' gajim.interface.instances[account] = {'infos': {}, 'disco': {}, 'gc_config': {}, 'search': {}, 'sub_request': {}} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0d3ce37b2756876326431d83b4d322f9c3…

1 0

[Git][gajim/gajim][master] fix logging single messages. Fixes #8640
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 388acfca by Yann Leboulanger at 2017-06-14T15:29:19+02:00 fix logging single messages. Fixes #8640 - - - - - 2 changed files: - src/common/connection.py - src/common/zeroconf/connection_zeroconf.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -413,14 +413,14 @@ class CommonConnection: gajim.nec.push_incoming_event( StanzaMessageOutgoingEvent(None, **vars(obj))) - def log_message(self, obj): + def log_message(self, obj, jid): if not obj.is_loggable: return if obj.forward_from or not obj.session or not obj.session.is_loggable(): return - if not gajim.config.should_log(self.name, obj.jid): + if not gajim.config.should_log(self.name, jid): return if obj.xhtml and gajim.config.get('log_xhtml_messages'): @@ -437,7 +437,7 @@ class CommonConnection: kind = 'single_msg_sent' gajim.logger.write( - kind, obj.jid, message, subject=obj.subject, + kind, jid, message, subject=obj.subject, additional_data=obj.additional_data) def ack_subscribed(self, jid): @@ -2058,9 +2058,9 @@ class Connection(CommonConnection, ConnectionHandlers): for j in obj.jid: if obj.session is None: obj.session = self.get_or_create_session(j, '') - self.log_message(obj) + self.log_message(obj, j) else: - self.log_message(obj) + self.log_message(obj, obj.jid) def send_contacts(self, contacts, fjid, type_='message'): """ ===================================== src/common/zeroconf/connection_zeroconf.py ===================================== --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -342,7 +342,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): if obj.callback: obj.callback(obj.msg_iq, *obj.callback_args) - self.log_message(obj) + self.log_message(obj, obj.jid) def on_send_not_ok(reason): reason += ' ' + _('Your message could not be sent.') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/388acfca5a672a004e205d2c8083ab55bb…

1 0

[Git][gajim/gajim][master] 2 commits: fix frong commit from 2fbadc91
by Yann Leboulanger 14 Jun '17

14 Jun '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 2c24c5a1 by Yann Leboulanger at 2017-06-14T15:09:29+02:00 fix frong commit from 2fbadc91 - - - - - 4f7b7288 by Yann Leboulanger at 2017-06-14T15:10:26+02:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -3279,7 +3279,7 @@ class RosterWindow: type_ = model[list_of_paths[0]][Column.TYPE] account = model[list_of_paths[0]][Column.ACCOUNT] if type_ in ('account', 'group', 'self_contact') or \ - account == gajim.ZEROCONF_ACConstant.NAME: + account == gajim.ZEROCONF_ACC_NAME: return list_ = [] for path in list_of_paths: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9dc389cc32f8bc8f51c694f54b5a4785c…

1 0

[Git][gajim/gajim][master] Show warning icon when encryption is disabled
by Philipp Hörist 12 Jun '17

12 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dc389cc by Philipp Hörist at 2017-06-13T00:02:44+02:00 Show warning icon when encryption is disabled 'channel-insecure-symbolic' icon if no encryption is selected 'channel-secure-symbolic' if an encryption is selected - - - - - 4 changed files: - src/chat_control.py - src/chat_control_base.py - src/groupchat_control.py - src/gtkgui_helpers.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -287,6 +287,7 @@ class ChatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + self.set_encryption_menu_icon() # restore previous conversation self.restore_conversation() self.msg_textview.grab_focus() ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -36,6 +36,7 @@ from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio import gtkgui_helpers +from gtkgui_helpers import Color import message_control import dialogs import history_window @@ -442,6 +443,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.terminate_esessions() action.set_state(param) self.set_encryption_state(encryption) + self.set_encryption_menu_icon() self.set_lock_image() def set_encryption_state(self, encryption): @@ -455,6 +457,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): state = gajim.config.get_per('encryption', config_key, 'encryption') return state or None + def set_encryption_menu_icon(self): + for child in self.encryption_menu.get_children(): + if isinstance(child, Gtk.Image): + image = child + break + + if not self.encryption: + icon = gtkgui_helpers.get_icon_pixmap( + 'channel-insecure-symbolic', color=[Color.BLACK]) + else: + icon = gtkgui_helpers.get_icon_pixmap('channel-secure-symbolic') + image.set_from_pixbuf(icon) + def set_speller(self): # now set the one the user selected per_type = 'contacts' ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -493,6 +493,7 @@ class GroupchatControl(ChatControlBase): self.encryption_menu = self.xml.get_object('encryption_menu') self.encryption_menu.set_menu_model( gui_menu_builder.get_encryption_menu(self.contact, self.type_id)) + self.set_encryption_menu_icon() gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -53,9 +53,16 @@ from common import configpaths gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(gajim.ICONS_DIR) -def get_icon_pixmap(icon_name, size=16, quiet=False): +class Color: + BLACK = Gdk.RGBA(red=0, green=0, blue=0, alpha=1) + +def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): try: - return gtk_icon_theme.load_icon(icon_name, size, 0) + iconinfo = gtk_icon_theme.lookup_icon(icon_name, size, 0) + if color: + pixbuf, was_symbolic = iconinfo.load_symbolic(*color) + return pixbuf + return iconinfo.load_icon() except GLib.GError as e: if not quiet: log.error('Unable to load icon %s: %s' % (icon_name, str(e))) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9dc389cc32f8bc8f51c694f54b5a4785c0…

1 0

[Git][gajim/gajim][master] Fix Layout issues with long status messages
by Philipp Hörist 12 Jun '17

12 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: f7754487 by Philipp Hörist at 2017-06-12T22:20:03+02:00 Fix Layout issues with long status messages Fixes #8652 - - - - - 4 changed files: - data/gui/tooltip_gc_contact.ui - data/gui/vcard_information_window.ui - src/tooltips.py - src/vcard.py Changes: ===================================== data/gui/tooltip_gc_contact.ui ===================================== --- a/data/gui/tooltip_gc_contact.ui +++ b/data/gui/tooltip_gc_contact.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.12"/> <object class="GtkGrid" id="tooltip_grid"> @@ -10,8 +10,8 @@ <object class="GtkLabel" id="nick"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -26,10 +26,11 @@ <object class="GtkLabel" id="status"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> <property name="max_width_chars">40</property> - <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> </attributes> @@ -44,9 +45,9 @@ <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="label" translatable="yes">Jabber ID:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -69,9 +70,9 @@ <object class="GtkLabel" id="resource_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -82,8 +83,8 @@ <object class="GtkLabel" id="affiliation"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -95,8 +96,8 @@ <object class="GtkLabel" id="user_show"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -108,6 +109,7 @@ <object class="GtkLabel" id="fillelement"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="vexpand">True</property> </object> <packing> @@ -120,8 +122,8 @@ <object class="GtkLabel" id="resource"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -132,8 +134,8 @@ <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="hexpand">True</property> - <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> </attributes> ===================================== data/gui/vcard_information_window.ui ===================================== --- a/data/gui/vcard_information_window.ui +++ b/data/gui/vcard_information_window.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="vcard_information_window"> <property name="can_focus">False</property> <property name="border_width">12</property> @@ -20,8 +20,8 @@ <object class="GtkLabel" id="nickname_label"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="halign">start</property> <property name="selectable">True</property> - <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -50,9 +50,10 @@ <object class="GtkLabel" id="JabberID_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Jabber ID:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -63,10 +64,10 @@ <object class="GtkLabel" id="Resource_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -77,10 +78,10 @@ <object class="GtkLabel" id="Status_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Status:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -91,10 +92,10 @@ <object class="GtkLabel" id="Client_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Client:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -105,10 +106,10 @@ <object class="GtkLabel" id="System_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">System:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -119,10 +120,10 @@ <object class="GtkLabel" id="Time_Label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes">Contact time:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -133,10 +134,11 @@ <object class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -153,11 +155,11 @@ <object class="GtkLabel" id="resource_prio_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> </child> </object> @@ -167,37 +169,14 @@ </packing> </child> <child> - <object class="GtkEventBox" id="status_label_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="visible_window">False</property> - <child> - <object class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> <object class="GtkLabel" id="client_name_version_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -208,12 +187,12 @@ <object class="GtkLabel" id="os_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="wrap">True</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -224,11 +203,11 @@ <object class="GtkLabel" id="time_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> <property name="hexpand">True</property> - <property name="xpad">5</property> <property name="selectable">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="left_attach">1</property> @@ -240,10 +219,8 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="halign">start</property> - <property name="ypad">5</property> <property name="label" translatable="yes">User avatar:</property> <property name="use_markup">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -251,35 +228,11 @@ </packing> </child> <child> - <object class="GtkEventBox" id="PHOTO_eventbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="visible_window">False</property> - <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> - <child> - <object class="GtkImage" id="PHOTO_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-missing-image</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - <property name="height">7</property> - </packing> - </child> - <child> <object class="GtkLabel" id="custom_avatar_label"> <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Configured avatar:</property> <property name="use_markup">True</property> - <property name="xalign">0</property> </object> <packing> <property name="left_attach">2</property> @@ -291,7 +244,8 @@ <property name="can_focus">False</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="xalign">0</property> + <property name="halign">start</property> + <property name="valign">start</property> <property name="stock">gtk-missing-image</property> </object> <packing> @@ -304,9 +258,10 @@ <object class="GtkLabel" id="ask_title_label"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> <property name="label" translatable="yes" comments="Given Name">Ask:</property> <property name="use_markup">True</property> - <property name="xalign">1</property> </object> <packing> <property name="left_attach">0</property> @@ -314,56 +269,86 @@ </packing> </child> <child> - <object class="GtkEventBox" id="ask_label_eventbox"> + <object class="GtkLabel" id="subscription_title_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="visible_window">False</property> - <child> - <object class="GtkLabel" id="ask_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="xalign">0</property> - </object> - </child> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes" comments="Family Name">Subscription:</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + <property name="width_chars">20</property> + <property name="max_width_chars">30</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="subscription_title_label"> + <object class="GtkLabel" id="subscription_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Family Name">Subscription:</property> - <property name="use_markup">True</property> - <property name="xalign">1</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">6</property> </packing> </child> <child> - <object class="GtkEventBox" id="subscription_label_eventbox"> + <object class="GtkLabel" id="ask_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkEventBox" id="PHOTO_eventbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="visible_window">False</property> + <signal name="button-press-event" handler="on_PHOTO_eventbox_button_press_event" swapped="no"/> <child> - <object class="GtkLabel" id="subscription_label"> - <property name="visible">True</property> + <object class="GtkImage" id="PHOTO_image"> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="xpad">5</property> - <property name="xalign">0</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="stock">gtk-missing-image</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + <property name="height">7</property> </packing> </child> </object> @@ -373,8 +358,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Contact</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="tab_fill">False</property> @@ -952,8 +935,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Personal Info</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">1</property> @@ -1353,8 +1334,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Work</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">2</property> @@ -1387,8 +1366,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" comments=""About" is the text of a tab of vcard window">About</property> - <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> <property name="position">3</property> ===================================== src/tooltips.py ===================================== --- a/src/tooltips.py +++ b/src/tooltips.py @@ -31,6 +31,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from gi.repository import Pango import os import time from datetime import datetime @@ -207,6 +208,7 @@ class StatusTable: self.table.insert_row(self.current_row) self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) + self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) self.text_label.set_max_width_chars(35) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) ===================================== src/vcard.py ===================================== --- a/src/vcard.py +++ b/src/vcard.py @@ -404,11 +404,8 @@ class VcardWindow: if self.contact.status: stats += ': ' + self.contact.status status_label = self.xml.get_object('status_label') - status_label.set_max_width_chars(15) status_label.set_text(stats) - - status_label_eventbox = self.xml.get_object('status_label_eventbox') - status_label_eventbox.set_tooltip_text(stats) + status_label.set_tooltip_text(stats) def fill_jabber_page(self): self.xml.get_object('nickname_label').set_markup( @@ -430,7 +427,6 @@ class VcardWindow: else: uf_sub = helpers.get_uf_sub(self.contact.sub) subscription_label.set_text(uf_sub) - eb = self.xml.get_object('subscription_label_eventbox') if self.contact.sub == 'from': tt_text = _("This contact is interested in your presence information, but you are not interested in their presence") elif self.contact.sub == 'to': @@ -439,16 +435,15 @@ class VcardWindow: tt_text = _("The contact and you want to exchange presence information") else: # None tt_text = _("You and the contact have a mutual disinterest in each-others presence information") - eb.set_tooltip_text(tt_text) + subscription_label.set_tooltip_text(tt_text) uf_ask = helpers.get_uf_ask(self.contact.ask) ask_label.set_text(uf_ask) - eb = self.xml.get_object('ask_label_eventbox') if self.contact.ask == 'subscribe': tt_text = _("You are waiting contact's answer about your subscription request") else: tt_text = _("There is no pending subscription request.") - eb.set_tooltip_text(tt_text) + ask_label.set_tooltip_text(tt_text) resources = '%s (%s)' % (self.contact.resource, str( self.contact.priority)) @@ -613,11 +608,8 @@ class ZeroconfVcardWindow: if self.contact.status: stats += ': ' + self.contact.status status_label = self.xml.get_object('status_label') - status_label.set_max_width_chars(15) status_label.set_text(stats) - - status_label_eventbox = self.xml.get_object('status_label_eventbox') - status_label_eventbox.set_tooltip_text(stats) + status_label.set_tooltip_text(stats) def fill_contact_page(self): self.xml.get_object('nickname_label').set_markup( View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f7754487ccee4f4a1e797225041f53966f…

1 0

[Git][gajim/gajim][gajim_0.16] Update servers.xml
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: d3914584 by Nulll at 2017-06-11T23:01:44+02:00 Update servers.xml - - - - - 1 changed file: - data/other/servers.xml Changes: ===================================== data/other/servers.xml ===================================== --- a/data/other/servers.xml +++ b/data/other/servers.xml @@ -8,6 +8,7 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> + <item jid="404.city" /> <item jid="brauchen.info" /> <item jid="chatme.im" /> <item jid="climm.org" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d391458417b037f7d07cb19b378b161783…

1 0

[Git][gajim/gajim][master] 2 commits: Update servers.xml
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 22096d58 by Nulll at 2017-05-29T18:23:49+02:00 Update servers.xml - - - - - f419127b by Philipp Hörist at 2017-06-11T22:59:25+02:00 Merge branch 'patch-1' into 'master' Update servers.xml See merge request !101 - - - - - 1 changed file: - data/other/servers.xml Changes: ===================================== data/other/servers.xml ===================================== --- a/data/other/servers.xml +++ b/data/other/servers.xml @@ -8,6 +8,7 @@ --> <query xmlns:reg="urn:xmpp:vcard:registration:1"> <item jid="0nl1ne.at" /> + <item jid="404.city" /> <item jid="brauchen.info" /> <item jid="chatme.im" /> <item jid="climm.org" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/209fa4c92634cdd86ee6ae25b34c3ab63…

1 0

[Git][gajim/gajim][master] Dont set scrollbar policy in GC config window
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 209fa4c9 by Philipp Hörist at 2017-06-11T22:54:15+02:00 Dont set scrollbar policy in GC config window This crashes Gajim on Windows. Its to be investigated why this happens and how we can avoid it. - - - - - 1 changed file: - src/config.py Changes: ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -2935,7 +2935,6 @@ class GroupchatConfigWindow: self.affiliation_treeview[affiliation].append_column(col) sw = Gtk.ScrolledWindow() - sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.NEVER) sw.add(self.affiliation_treeview[affiliation]) add_on_vbox.pack_start(sw, True, True, 0) gajim.connections[self.account].get_affiliation_list(self.room_jid, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/209fa4c92634cdd86ee6ae25b34c3ab636…

1 0

[Git][gajim/gajim][master] Show encryption icon in chat
by Philipp Hörist 11 Jun '17

11 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c34dd6d by Philipp Hörist at 2017-06-11T20:06:34+02:00 Show encryption icon in chat - - - - - 6 changed files: - + icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png - src/chat_control.py - src/chat_control_base.py - src/common/connection_handlers_events.py - src/conversation_textview.py - src/groupchat_control.py Changes: ===================================== icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png ===================================== Binary files /dev/null and b/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png differ ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -990,7 +990,7 @@ class ChatControl(ChatControlBase): def get_our_nick(self): return gajim.nicks[self.account] - def print_conversation(self, text, frm='', tim=None, encrypted=False, + def print_conversation(self, text, frm='', tim=None, encrypted=None, subject=None, xhtml=None, simple=False, xep0184_id=None, displaymarking=None, msg_log_id=None, correct_id=None, msg_stanza_id=None, additional_data=None): @@ -1023,12 +1023,6 @@ class ChatControl(ChatControlBase): kind = 'info' name = '' else: - if self.session and self.session.enable_encryption: - # ESessions - if not encrypted: - msg = _('The following message was NOT encrypted') - ChatControlBase.print_conversation_line(self, msg, 'status', - '', tim) if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -1048,7 +1042,8 @@ class ChatControl(ChatControlBase): subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, msg_log_id=msg_log_id, msg_stanza_id=msg_stanza_id, - correct_id=correct_id, additional_data=additional_data) + correct_id=correct_id, additional_data=additional_data, + encrypted=encrypted) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: ===================================== src/chat_control_base.py ===================================== --- a/src/chat_control_base.py +++ b/src/chat_control_base.py @@ -894,7 +894,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): 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, xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, - msg_stanza_id=None, correct_id=None, additional_data=None): + msg_stanza_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages correct_id = (message_id, correct_id) @@ -919,7 +920,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): other_tags_for_name, other_tags_for_time, other_tags_for_text, subject, old_kind, xhtml, simple=simple, graphics=graphics, displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, - correct_id=correct_id, additional_data=additional_data) + correct_id=correct_id, additional_data=additional_data, + encrypted=encrypted) if xep0184_id is not None: textview.add_xep0184_mark(xep0184_id) ===================================== src/common/connection_handlers_events.py ===================================== --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1497,6 +1497,7 @@ class GcMessageReceivedEvent(nec.NetworkIncomingEvent): self.nickname = self.msg_obj.resource self.timestamp = self.msg_obj.timestamp self.xhtml_msgtxt = self.stanza.getXHTML() + self.encrypted = self.msg_obj.encrypted self.correct_id = None # XEP-0308 if gajim.config.get('ignore_incoming_xhtml'): ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -170,6 +170,8 @@ class ConversationTextview(GObject.GObject): MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'document-edit-symbolic') + MESSAGE_ENCRYPTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'channel-secure-croped-symbolic') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds @@ -1100,7 +1102,8 @@ class ConversationTextview(GObject.GObject): def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None): + displaymarking=None, msg_stanza_id=None, correct_id=None, additional_data=None, + encrypted=None): """ Print 'chat' type messages """ @@ -1168,6 +1171,9 @@ class ConversationTextview(GObject.GObject): self.print_time(text, kind, tim, simple, direction_mark, other_tags_for_time, iter_) + if encrypted: + buffer_.insert_pixbuf(iter_, self.MESSAGE_ENCRYPTED_PIXBUF) + # If there's a displaymarking, print it here. if displaymarking: self.print_displaymarking(displaymarking, iter_=iter_) ===================================== src/groupchat_control.py ===================================== --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1090,14 +1090,14 @@ class GroupchatControl(ChatControlBase): # don't print xhtml if it's an old message. # Like that xhtml messages are grayed too. self.print_old_conversation(obj.msgtxt, contact=obj.nick, - tim=obj.timestamp, xhtml=None, + tim=obj.timestamp, xhtml=None, encrypted=obj.encrypted, displaymarking=obj.displaymarking, msg_stanza_id=obj.id_) else: if obj.nick == self.nick: self.last_sent_txt = obj.msgtxt self.print_conversation(obj.msgtxt, contact=obj.nick, tim=obj.timestamp, xhtml=obj.xhtml_msgtxt, - displaymarking=obj.displaymarking, + displaymarking=obj.displaymarking, encrypted=obj.encrypted, correct_id=obj.correct_id, msg_stanza_id=obj.id_) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) @@ -1153,7 +1153,7 @@ class GroupchatControl(ChatControlBase): return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None, - displaymarking=None, msg_stanza_id=None): + displaymarking=None, msg_stanza_id=None, encrypted=None): if contact: if contact == self.nick: # it's us kind = 'outgoing' @@ -1165,13 +1165,16 @@ class GroupchatControl(ChatControlBase): small_attr = ['small'] else: small_attr = [] + ChatControlBase.print_conversation_line(self, text, kind, contact, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], count_as_new=False, xhtml=xhtml, - displaymarking=displaymarking, msg_stanza_id=msg_stanza_id) + displaymarking=displaymarking, msg_stanza_id=msg_stanza_id, + encrypted=encrypted) def print_conversation(self, text, contact='', tim=None, xhtml=None, - graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None): + graphics=True, displaymarking=None, correct_id=None, msg_stanza_id=None, + encrypted=None): """ Print a line in the conversation @@ -1233,7 +1236,7 @@ class GroupchatControl(ChatControlBase): ChatControlBase.print_conversation_line(self, text, kind, contact, tim, other_tags_for_name, [], other_tags_for_text, xhtml=xhtml, graphics=graphics, displaymarking=displaymarking, - correct_id=correct_id, msg_stanza_id=msg_stanza_id) + correct_id=correct_id, msg_stanza_id=msg_stanza_id, encrypted=encrypted) def get_nb_unread(self): type_events = ['printed_marked_gc_msg'] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c34dd6d458d2a09731925fa2e7346ac0b…

1 0

[Git][gajim/gajim][master] Set transient for ErrorDialog
by Philipp Hörist 08 Jun '17

08 Jun '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8115e41 by Philipp Hörist at 2017-06-08T23:34:03+02:00 Set transient for ErrorDialog Fixes #8649 - - - - - 1 changed file: - src/adhoc_commands.py Changes: ===================================== src/adhoc_commands.py ===================================== --- a/src/adhoc_commands.py +++ b/src/adhoc_commands.py @@ -367,8 +367,10 @@ class CommandWindow: if self.data_form_widget.get_data_form(): df = self.data_form_widget.get_data_form() if not df.is_valid(): - dialogs.ErrorDialog(_('Invalid Form'), - _('The form is not filled correctly.')) + dialogs.ErrorDialog( + _('Invalid Form'), + _('The form is not filled correctly.'), + transient_for=self.window) self.data_form_widget.set_sensitive(True) return self.data_form_widget.data_form.type_ = 'submit' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8115e4164496da3527486507cb0c0acb8…

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