]> git.0d.be Git - empathy.git/commitdiff
CallWindow: remove the hangup menu item
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Tue, 2 Aug 2011 11:45:14 +0000 (12:45 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 4 Aug 2011 09:10:19 +0000 (10:10 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=655884

src/empathy-call-window.c
src/empathy-call-window.ui

index f39c0f8d4010c055b158e2dd1ca2ede55f364d2d..338686d2a96a0c2728482f411a198da14acf5366 100644 (file)
@@ -815,7 +815,6 @@ empathy_call_window_init (EmpathyCallWindow *self)
   g_free (filename);
 
   empathy_builder_connect (gui, self,
-    "menuhangup", "activate", empathy_call_window_hangup_cb,
     "hangup", "clicked", empathy_call_window_hangup_cb,
     "audiocall", "clicked", empathy_call_window_audio_call_cb,
     "videocall", "clicked", empathy_call_window_video_call_cb,
index f594d61bcf826bc99aa1ef51966b720e5b939d40..aa174f3382cf6d795564d415549e112931f18eee 100644 (file)
             <property name="label" translatable="yes">_Call</property>
           </object>
         </child>
-        <child>
-          <object class="GtkAction" id="menuhangup">
-            <property name="icon_name">call-stop</property>
-            <property name="name">menuhangup</property>
-            <property name="label" translatable="yes">Hang up</property>
-          </object>
-        </child>
         <child>
           <object class="GtkAction" id="menufullscreen">
             <property name="stock_id">gtk-fullscreen</property>
@@ -60,7 +53,6 @@
     <ui>
       <menubar name="menubar1">
         <menu action="call">
-          <menuitem action="menuhangup"/>
           <menuitem action="menufullscreen"/>
         </menu>
         <menu action="edit">