Show
Ignore:
Timestamp:
12/12/07 09:44:46 (12 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/pep/data/glade/gc_occupants_menu.glade

    r8478 r9123  
    1313            <property name="visible">True</property> 
    1414            <property name="stock">gtk-jump-to</property> 
     15            <property name="icon_size">1</property> 
     16          </widget> 
     17        </child> 
     18      </widget> 
     19    </child> 
     20    <child> 
     21      <widget class="GtkImageMenuItem" id="send_file_menuitem"> 
     22        <property name="visible">True</property> 
     23        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
     24        <property name="label" translatable="yes">Send _File</property> 
     25        <property name="use_underline">True</property> 
     26        <child internal-child="image"> 
     27          <widget class="GtkImage" id="menu-item-image4"> 
     28            <property name="stock">gtk-save</property> 
    1529            <property name="icon_size">1</property> 
    1630          </widget> 
    … …  
    89103    </child> 
    90104    <child> 
    91       <widget class="GtkImageMenuItem" id="send_file_menuitem"> 
    92         <property name="visible">True</property> 
    93         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    94         <property name="label" translatable="yes">Send _File</property> 
    95         <property name="use_underline">True</property> 
    96         <child internal-child="image"> 
    97           <widget class="GtkImage" id="menu-item-image4"> 
    98             <property name="stock">gtk-save</property> 
    99             <property name="icon_size">1</property> 
    100           </widget> 
    101         </child> 
    102       </widget> 
    103     </child> 
    104     <child> 
    105105      <widget class="GtkSeparatorMenuItem" id="separator6"> 
    106106        <property name="visible">True</property>