Show
Ignore:
Timestamp:
01/06/07 12:00:50 (23 months ago)
Author:
asterix
Message:

merge changeset from trunk except pyopenssl stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/gajim_0.11/data/glade/join_groupchat_window.glade

    r7112 r7787  
    3131        <widget class="GtkTable" id="table15"> 
    3232          <property name="visible">True</property> 
    33           <property name="n_rows">4</property> 
     33          <property name="n_rows">5</property> 
    3434          <property name="n_columns">2</property> 
    3535          <property name="homogeneous">False</property> 
     
    228228              <property name="top_attach">3</property> 
    229229              <property name="bottom_attach">4</property> 
     230              <property name="y_options"></property> 
     231            </packing> 
     232          </child> 
     233 
     234          <child> 
     235            <widget class="GtkCheckButton" id="auto_join_checkbutton"> 
     236              <property name="visible">True</property> 
     237              <property name="can_focus">True</property> 
     238              <property name="label" translatable="yes">Join this room automatically when I connect</property> 
     239              <property name="use_underline">True</property> 
     240              <property name="relief">GTK_RELIEF_NORMAL</property> 
     241              <property name="focus_on_click">True</property> 
     242              <property name="active">False</property> 
     243              <property name="inconsistent">False</property> 
     244              <property name="draw_indicator">True</property> 
     245            </widget> 
     246            <packing> 
     247              <property name="left_attach">0</property> 
     248              <property name="right_attach">2</property> 
     249              <property name="top_attach">4</property> 
     250              <property name="bottom_attach">5</property> 
     251              <property name="x_options">fill</property> 
    230252              <property name="y_options"></property> 
    231253            </packing>