Do not use gtk-new icon for new chatroom. Fixes bug #490153 (Michael Monreal).

svn path=/trunk/; revision=493

diff --git a/libempathy-gtk/empathy-chat.glade b/libempathy-gtk/empathy-chat.glade
index 1fcd2a27c800a745ead894bd405c009bbfee7f20..ca6dd56d0462e7179d63a4fd6005860aefe4305d 100644 (file)
--- a/libempathy-gtk/empathy-chat.glade
+++ b/libempathy-gtk/empathy-chat.glade
@@ -289,22 +289,10 @@
                  </child>
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="menu_room_join_new">
+                   <widget class="GtkMenuItem" id="menu_room_join_new">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Join _New...</property>
                      <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image267">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-new</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
                    </widget>
                  </child>
 

diff --git a/libempathy-gtk/empathy-main-window.glade b/libempathy-gtk/empathy-main-window.glade
index 4573a852c6398be5094e193a31ccbeab6e581cfa..c997f38cd829820ab5b0d57760b7c4f1ad16fbc1 100644 (file)
--- a/libempathy-gtk/empathy-main-window.glade
+++ b/libempathy-gtk/empathy-main-window.glade
@@ -248,22 +248,10 @@
                <widget class="GtkMenu" id="room_menu">
 
                  <child>
-                   <widget class="GtkImageMenuItem" id="room_join_new">
+                   <widget class="GtkMenuItem" id="room_join_new">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Join _New...</property>
                      <property name="use_underline">True</property>
-
-                     <child internal-child="image">
-                       <widget class="GtkImage" id="image889">
-                         <property name="visible">True</property>
-                         <property name="stock">gtk-new</property>
-                         <property name="icon_size">1</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                       </widget>
-                     </child>
                    </widget>
                  </child>
 

diff --git a/libempathy-gtk/empathy-new-chatroom-dialog.glade b/libempathy-gtk/empathy-new-chatroom-dialog.glade
index 07447340276ca9d92e5560a405c39bef4defacf8..6b99dc3e13410045b8577db6ae94ff7e6ef78bac 100644 (file)
--- a/libempathy-gtk/empathy-new-chatroom-dialog.glade
+++ b/libempathy-gtk/empathy-new-chatroom-dialog.glade
@@ -13,7 +13,6 @@
   <property name="default_width">350</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon_name">gtk-new</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>