Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/gui/account_context_menu.ui
    1 1
     <?xml version="1.0" encoding="UTF-8"?>
    
    2
    -<!-- Generated with glade 3.20.0 -->
    
    2
    +<!-- Generated with glade 3.22.1 -->
    
    3 3
     <interface>
    
    4 4
       <requires lib="gtk+" version="3.12"/>
    
    5 5
       <object class="GtkMenu" id="account_context_menu">
    
    ... ... @@ -66,6 +66,14 @@
    66 66
             <property name="use_underline">True</property>
    
    67 67
           </object>
    
    68 68
         </child>
    
    69
    +    <child>
    
    70
    +      <object class="GtkMenuItem" id="view_certificate_menuitem">
    
    71
    +        <property name="visible">True</property>
    
    72
    +        <property name="can_focus">False</property>
    
    73
    +        <property name="label" translatable="yes">_View Certificate</property>
    
    74
    +        <property name="use_underline">True</property>
    
    75
    +      </object>
    
    76
    +    </child>
    
    69 77
         <child>
    
    70 78
           <object class="GtkSeparatorMenuItem" id="seperator1">
    
    71 79
             <property name="visible">True</property>
    

  • gajim/roster_window.py
    ... ... @@ -72,6 +72,7 @@ from gajim.gtk.dialogs import InputDialog
    72 72
     from gajim.gtk.dialogs import WarningDialog
    
    73 73
     from gajim.gtk.dialogs import InformationDialog
    
    74 74
     from gajim.gtk.dialogs import NonModalConfirmationDialog
    
    75
    +from gajim.gtk.dialogs import CertificateDialog
    
    75 76
     from gajim.gtk.dialogs import InvitationReceivedDialog
    
    76 77
     from gajim.gtk.join_groupchat import JoinGroupchatWindow
    
    77 78
     from gajim.gtk.single_message import SingleMessageWindow
    
    ... ... @@ -3585,6 +3586,11 @@ class RosterWindow:
    3585 3586
                 jid = jid + '/' + resource
    
    3586 3587
             AdHocCommand(account, jid)
    
    3587 3588
     
    
    3589
    +    def on_view_certificate(self, widget, account):
    
    3590
    +        con = app.connections[account]
    
    3591
    +        cert = con.connection.Connection.ssl_certificate
    
    3592
    +        CertificateDialog(self.window, account, cert)
    
    3593
    +
    
    3588 3594
         def on_roster_window_focus_in_event(self, widget, event):
    
    3589 3595
             # roster received focus, so if we had urgency REMOVE IT
    
    3590 3596
             # NOTE: we do not have to read the message to remove urgency
    
    ... ... @@ -4812,6 +4818,8 @@ class RosterWindow:
    4812 4818
                     'service_discovery_menuitem')
    
    4813 4819
                 execute_command_menuitem = xml.get_object(
    
    4814 4820
                     'execute_command_menuitem')
    
    4821
    +            view_certificate_menuitem = xml.get_object(
    
    4822
    +                'view_certificate_menuitem')
    
    4815 4823
                 edit_account_menuitem = xml.get_object('edit_account_menuitem')
    
    4816 4824
                 sub_menu = Gtk.Menu()
    
    4817 4825
                 status_menuitem.set_submenu(sub_menu)
    
    ... ... @@ -4898,6 +4906,8 @@ class RosterWindow:
    4898 4906
                     account=account) # Fake contact
    
    4899 4907
                 execute_command_menuitem.connect('activate',
    
    4900 4908
                     self.on_execute_command, contact, account)
    
    4909
    +            view_certificate_menuitem.connect('activate',
    
    4910
    +                self.on_view_certificate, account)
    
    4901 4911
     
    
    4902 4912
                 gc_sub_menu = Gtk.Menu() # gc is always a submenu
    
    4903 4913
                 join_group_chat_menuitem.set_submenu(gc_sub_menu)
    
    ... ... @@ -4907,7 +4917,7 @@ class RosterWindow:
    4907 4917
                 if not app.account_is_connected(account):
    
    4908 4918
                     for widget in (add_contact_menuitem, service_discovery_menuitem,
    
    4909 4919
                     join_group_chat_menuitem, execute_command_menuitem,
    
    4910
    -                pep_menuitem):
    
    4920
    +                view_certificate_menuitem, pep_menuitem):
    
    4911 4921
                         widget.set_sensitive(False)
    
    4912 4922
             else:
    
    4913 4923
                 xml = get_builder('zeroconf_context_menu.ui')