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

Commits:

2 changed files:

Changes:

  • gajim/common/config.py
    ... ... @@ -209,7 +209,6 @@ class Config:
    209 209 
             'tabs_always_visible': [opt_bool, False, _('Show tab when only one conversation?')],
    210 210 
             'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')],
    211 211 
             'tabs_close_button': [opt_bool, True, _('Show close button in tab?')],
    212 
    -        'esession_modp': [opt_str, '15,16,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')],
    213 212 
             'tooltip_status_online_color': [opt_color, '#73D216'],
    214 213 
             'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'],
    215 214 
             'tooltip_status_away_color': [opt_color, '#EDD400'],

  • gajim/data/gui/esession_info_window.ui deleted
    1 
    -<?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!-- Generated with glade 3.18.3 -->
    3 
    -<interface>
    4 
    -  <requires lib="gtk+" version="3.12"/>
    5 
    -  <object class="GtkDialog" id="esession_info_window">
    6 
    -    <property name="can_focus">False</property>
    7 
    -    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
    8 
    -    <property name="border_width">5</property>
    9 
    -    <property name="window_position">center-on-parent</property>
    10 
    -    <property name="type_hint">dialog</property>
    11 
    -    <child internal-child="vbox">
    12 
    -      <object class="GtkBox" id="dialog-vbox1">
    13 
    -        <property name="visible">True</property>
    14 
    -        <property name="can_focus">False</property>
    15 
    -        <property name="orientation">vertical</property>
    16 
    -        <property name="spacing">2</property>
    17 
    -        <child internal-child="action_area">
    18 
    -          <object class="GtkButtonBox" id="dialog-action_area1">
    19 
    -            <property name="visible">True</property>
    20 
    -            <property name="can_focus">False</property>
    21 
    -            <property name="layout_style">end</property>
    22 
    -            <child>
    23 
    -              <object class="GtkButton" id="verify_now_button">
    24 
    -                <property name="use_action_appearance">False</property>
    25 
    -                <property name="visible">True</property>
    26 
    -                <property name="can_focus">True</property>
    27 
    -                <property name="receives_default">False</property>
    28 
    -                <signal name="clicked" handler="on_verify_now_button_clicked" swapped="no"/>
    29 
    -                <child>
    30 
    -                  <object class="GtkBox" id="hbox3">
    31 
    -                    <property name="visible">True</property>
    32 
    -                    <property name="can_focus">False</property>
    33 
    -                    <property name="spacing">2</property>
    34 
    -                    <child>
    35 
    -                      <object class="GtkImage" id="image2">
    36 
    -                        <property name="visible">True</property>
    37 
    -                        <property name="can_focus">False</property>
    38 
    -                        <property name="stock">gtk-apply</property>
    39 
    -                      </object>
    40 
    -                      <packing>
    41 
    -                        <property name="expand">False</property>
    42 
    -                        <property name="fill">False</property>
    43 
    -                        <property name="position">0</property>
    44 
    -                      </packing>
    45 
    -                    </child>
    46 
    -                    <child>
    47 
    -                      <object class="GtkLabel" id="button_label">
    48 
    -                        <property name="visible">True</property>
    49 
    -                        <property name="can_focus">False</property>
    50 
    -                        <property name="label" translatable="yes">_Verify</property>
    51 
    -                        <property name="use_underline">True</property>
    52 
    -                      </object>
    53 
    -                      <packing>
    54 
    -                        <property name="expand">False</property>
    55 
    -                        <property name="fill">False</property>
    56 
    -                        <property name="position">1</property>
    57 
    -                      </packing>
    58 
    -                    </child>
    59 
    -                  </object>
    60 
    -                </child>
    61 
    -              </object>
    62 
    -              <packing>
    63 
    -                <property name="expand">False</property>
    64 
    -                <property name="fill">False</property>
    65 
    -                <property name="position">0</property>
    66 
    -              </packing>
    67 
    -            </child>
    68 
    -            <child>
    69 
    -              <object class="GtkButton" id="close_button3">
    70 
    -                <property name="label">gtk-close</property>
    71 
    -                <property name="use_action_appearance">False</property>
    72 
    -                <property name="visible">True</property>
    73 
    -                <property name="can_focus">True</property>
    74 
    -                <property name="receives_default">False</property>
    75 
    -                <property name="use_stock">True</property>
    76 
    -                <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
    77 
    -              </object>
    78 
    -              <packing>
    79 
    -                <property name="expand">False</property>
    80 
    -                <property name="fill">False</property>
    81 
    -                <property name="position">1</property>
    82 
    -              </packing>
    83 
    -            </child>
    84 
    -          </object>
    85 
    -          <packing>
    86 
    -            <property name="expand">False</property>
    87 
    -            <property name="fill">True</property>
    88 
    -            <property name="pack_type">end</property>
    89 
    -            <property name="position">0</property>
    90 
    -          </packing>
    91 
    -        </child>
    92 
    -        <child>
    93 
    -          <object class="GtkBox" id="title-hbox">
    94 
    -            <property name="visible">True</property>
    95 
    -            <property name="can_focus">False</property>
    96 
    -            <child>
    97 
    -              <object class="GtkImage" id="security_image">
    98 
    -                <property name="width_request">32</property>
    99 
    -                <property name="height_request">32</property>
    100 
    -                <property name="visible">True</property>
    101 
    -                <property name="can_focus">False</property>
    102 
    -              </object>
    103 
    -              <packing>
    104 
    -                <property name="expand">False</property>
    105 
    -                <property name="fill">True</property>
    106 
    -                <property name="position">0</property>
    107 
    -              </packing>
    108 
    -            </child>
    109 
    -            <child>
    110 
    -              <object class="GtkLabel" id="verification_status_label">
    111 
    -                <property name="visible">True</property>
    112 
    -                <property name="can_focus">False</property>
    113 
    -                <property name="xalign">0</property>
    114 
    -              </object>
    115 
    -              <packing>
    116 
    -                <property name="expand">True</property>
    117 
    -                <property name="fill">True</property>
    118 
    -                <property name="position">1</property>
    119 
    -              </packing>
    120 
    -            </child>
    121 
    -          </object>
    122 
    -          <packing>
    123 
    -            <property name="expand">False</property>
    124 
    -            <property name="fill">True</property>
    125 
    -            <property name="position">1</property>
    126 
    -          </packing>
    127 
    -        </child>
    128 
    -        <child>
    129 
    -          <object class="GtkBox" id="hbox4">
    130 
    -            <property name="visible">True</property>
    131 
    -            <property name="can_focus">False</property>
    132 
    -            <property name="spacing">4</property>
    133 
    -            <child>
    134 
    -              <object class="GtkLabel" id="info_display">
    135 
    -                <property name="visible">True</property>
    136 
    -                <property name="can_focus">False</property>
    137 
    -                <property name="label" translatable="yes">(&lt;b&gt;ESession&lt;/b&gt; info)</property>
    138 
    -                <property name="use_markup">True</property>
    139 
    -                <property name="wrap">True</property>
    140 
    -              </object>
    141 
    -              <packing>
    142 
    -                <property name="expand">False</property>
    143 
    -                <property name="fill">False</property>
    144 
    -                <property name="padding">10</property>
    145 
    -                <property name="position">0</property>
    146 
    -              </packing>
    147 
    -            </child>
    148 
    -          </object>
    149 
    -          <packing>
    150 
    -            <property name="expand">False</property>
    151 
    -            <property name="fill">False</property>
    152 
    -            <property name="position">2</property>
    153 
    -          </packing>
    154 
    -        </child>
    155 
    -      </object>
    156 
    -    </child>
    157 
    -    <action-widgets>
    158 
    -      <action-widget response="-10">verify_now_button</action-widget>
    159 
    -      <action-widget response="-7">close_button3</action-widget>
    160 
    -    </action-widgets>
    161 
    -  </object>
    162 
    -</interface>

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.