Show
Ignore:
Timestamp:
08/09/07 17:39:18 (17 months ago)
Author:
asterix
Message:

merge diff from trunk to pep branch

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/pep/data/glade/roster_contact_context_menu.glade

    r8197 r8478  
    6666    </child> 
    6767    <child> 
    68       <widget class="GtkMenuItem" id="send_custom_status_menuitem"> 
    69         <property name="visible">True</property> 
    70         <property name="label" translatable="yes">Send cus_tom status</property> 
     68      <widget class="GtkImageMenuItem" id="send_custom_status_menuitem"> 
     69        <property name="visible">True</property> 
     70        <property name="label" translatable="yes">Send Cus_tom Status</property> 
    7171        <property name="use_underline">True</property> 
    7272        <child> 
     
    9696        <property name="visible">True</property> 
    9797        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    98         <property name="label" translatable="yes">_Manage contact</property> 
     98        <property name="label" translatable="yes">_Manage Contact</property> 
    9999        <property name="use_underline">True</property> 
    100100        <child> 
     
    124124                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    125125                    <property name="stock">gtk-edit</property> 
     126                    <property name="icon_size">1</property> 
    126127                  </widget> 
    127128                </child> 
     
    143144            </child> 
    144145            <child> 
    145               <widget class="GtkImageMenuItem" id="custom_avatar"> 
     146              <widget class="GtkImageMenuItem" id="set_custom_avatar_menuitem"> 
    146147                <property name="visible">True</property> 
    147148                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
     
    153154                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    154155                    <property name="stock">gtk-orientation-portrait</property> 
     156                    <property name="icon_size">1</property> 
    155157                  </widget> 
    156158                </child> 
     
    160162              <widget class="GtkImageMenuItem" id="add_special_notification_menuitem"> 
    161163                <property name="visible">True</property> 
     164                <property name="no_show_all">True</property> 
    162165                <property name="label" translatable="yes">Add Special _Notification</property> 
    163166                <property name="use_underline">True</property> 
     
    245248                  <widget class="GtkImage" id="image1715"> 
    246249                    <property name="visible">True</property> 
    247                     <property name="stock">gtk-yes</property> 
     250                    <property name="stock">gtk-stop</property> 
    248251                    <property name="icon_size">1</property> 
    249252                  </widget> 
     
    299302            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> 
    300303            <property name="stock">gtk-properties</property> 
     304            <property name="icon_size">1</property> 
    301305          </widget> 
    302306        </child> 
     
    310314    <child> 
    311315      <widget class="GtkImageMenuItem" id="information_menuitem"> 
    312         <property name="label">gtk-dialog-info</property> 
     316        <property name="label">gtk-info</property> 
    313317        <property name="use_underline">True</property> 
    314318        <property name="use_stock">True</property>