[ekiga] Fix string (hangup -> hang up, pickup -> pick up)

[Eugen Dedu <ededu src gnome org>]

commit dbc82f949e034edb8b3639c568d1824dba9a6806
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Dec 4 10:53:40 2012 +0100

    Fix string (hangup -> hang up, pickup -> pick up)

 lib/engine/components/opal/opal-call.cpp    |    2 +-
 lib/engine/components/opal/opal-call.h      |    4 +-
 lib/engine/gui/gtk-frontend/call-window.cpp |   72 +++++++++++++-------------
 lib/engine/protocol/call.h                  |    4 +-
 plugins/libnotify/libnotify-main.cpp        |    2 +-
 src/gui/main_window.cpp                     |    2 +-
 6 files changed, 43 insertions(+), 43 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index 8993905..5fadcf9 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -123,7 +123,7 @@ Opal::Call::~Call ()
 
 
 void
-Opal::Call::hangup ()
+Opal::Call::hang_up ()
 {
   if (!is_outgoing () && !IsEstablished ())
     Clear (OpalConnection::EndedByAnswerDenied);
diff --git a/lib/engine/components/opal/opal-call.h b/lib/engine/components/opal/opal-call.h
index 66b53a9..04d2079 100644
--- a/lib/engine/components/opal/opal-call.h
+++ b/lib/engine/components/opal/opal-call.h
@@ -70,9 +70,9 @@ public:
      * Call Management
      */
 
-    /** Hangup the call
+    /** Hang up the call
     */
-    void hangup ();
+    void hang_up ();
 
     /** Answer an incoming call
     */
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 5cc40aa..0ca21e2 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -111,8 +111,8 @@ struct _EkigaCallWindowPrivate
 
   GtkWidget *main_menu;
   GtkWidget *call_panel_toolbar;
-  GtkWidget *pickup_button;
-  GtkWidget *hangup_button;
+  GtkWidget *pick_up_button;
+  GtkWidget *hang_up_button;
   GtkWidget *hold_button;
   GtkWidget *audio_settings_button;
   GtkWidget *video_settings_button;
@@ -218,10 +218,10 @@ static void stay_on_top_changed_nt (gpointer id,
                                     GmConfEntry *entry,
                                     gpointer data);
 
-static void pickup_call_cb (GtkWidget * /*widget*/,
+static void pick_up_call_cb (GtkWidget * /*widget*/,
                             gpointer data);
 
-static void hangup_call_cb (GtkWidget * /*widget*/,
+static void hang_up_call_cb (GtkWidget * /*widget*/,
                             gpointer data);
 
 static void show_window_cb (GtkWidget *widget,
@@ -586,7 +586,7 @@ fullscreen_changed_cb (G_GNUC_UNUSED GtkWidget *widget,
 }
 
 static void
-pickup_call_cb (GtkWidget * /*widget*/,
+pick_up_call_cb (GtkWidget * /*widget*/,
                 gpointer data)
 {
   EkigaCallWindow *cw = EKIGA_CALL_WINDOW (data);
@@ -596,13 +596,13 @@ pickup_call_cb (GtkWidget * /*widget*/,
 }
 
 static void
-hangup_call_cb (GtkWidget * /*widget*/,
+hang_up_call_cb (GtkWidget * /*widget*/,
                 gpointer data)
 {
   EkigaCallWindow *cw = EKIGA_CALL_WINDOW (data);
 
   if (cw->priv->current_call)
-    cw->priv->current_call->hangup ();
+    cw->priv->current_call->hang_up ();
 }
 
 
@@ -1349,9 +1349,9 @@ ekiga_call_window_delete_event_cb (GtkWidget *widget,
   cw = EKIGA_CALL_WINDOW (widget);
   g_return_val_if_fail (EKIGA_IS_CALL_WINDOW (cw), false);
 
-  /* Hangup or disable preview */
+  /* Hang up or disable preview */
   if (cw->priv->calling_state != Standby && cw->priv->current_call) {
-    cw->priv->current_call->hangup ();
+    cw->priv->current_call->hang_up ();
   }
   else {
     gm_conf_set_bool (VIDEO_DEVICES_KEY "enable_preview", false);
@@ -1393,8 +1393,8 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
       gtk_menu_set_sensitive (cw->priv->main_menu, "connect", false);
       gtk_menu_set_sensitive (cw->priv->main_menu, "disconnect", false);
       gtk_menu_section_set_sensitive (cw->priv->main_menu, "hold_call", false);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), false);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hangup_button), false);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pick_up_button), false);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hang_up_button), false);
       gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hold_button), false);
 
       /* Spinner updates */
@@ -1418,8 +1418,8 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
       gtk_widget_show (cw->priv->call_frame);
 
       /* Update the menus and toolbar items */
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), false);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hangup_button), true);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pick_up_button), false);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hang_up_button), true);
       gtk_menu_set_sensitive (cw->priv->main_menu, "connect", false);
       gtk_menu_set_sensitive (cw->priv->main_menu, "disconnect", true);
       break;
@@ -1446,8 +1446,8 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
       gtk_menu_set_sensitive (cw->priv->main_menu, "connect", false);
       gtk_menu_set_sensitive (cw->priv->main_menu, "disconnect", true);
       gtk_menu_section_set_sensitive (cw->priv->main_menu, "hold_call", true);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), false);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hangup_button), true);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pick_up_button), false);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hang_up_button), true);
       gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hold_button), true);
       break;
 
@@ -1455,8 +1455,8 @@ ekiga_call_window_update_calling_state (EkigaCallWindow *cw,
     case Called:
 
       /* Update the menus and toolbar items */
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), true);
-      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hangup_button), true);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pick_up_button), true);
+      gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hang_up_button), true);
       gtk_menu_set_sensitive (cw->priv->main_menu, "connect", true);
       gtk_menu_set_sensitive (cw->priv->main_menu, "disconnect", true);
 
@@ -1985,11 +1985,11 @@ ekiga_call_window_init_menu (EkigaCallWindow *cw)
 
       GTK_MENU_THEME_ENTRY("connect", _("_Pick up"), _("Pick up the current call"),
                            "phone-pick-up", 'd',
-                           G_CALLBACK (pickup_call_cb), cw, false),
+                           G_CALLBACK (pick_up_call_cb), cw, false),
 
-      GTK_MENU_THEME_ENTRY("disconnect", _("_Hangup"), _("Hangup the current call"),
+      GTK_MENU_THEME_ENTRY("disconnect", _("_Hang up"), _("Hang up the current call"),
                            "phone-hang-up", 'd',
-                           G_CALLBACK (hangup_call_cb), cw, false),
+                           G_CALLBACK (hang_up_call_cb), cw, false),
 
       GTK_MENU_SEPARATOR,
 
@@ -2390,35 +2390,35 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
 
   /* Pick up */
   item = gtk_tool_item_new ();
-  cw->priv->pickup_button = gtk_button_new ();
+  cw->priv->pick_up_button = gtk_button_new ();
   image = gtk_image_new_from_icon_name ("phone-pick-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
-  gtk_container_add (GTK_CONTAINER (cw->priv->pickup_button), image);
-  gtk_container_add (GTK_CONTAINER (item), cw->priv->pickup_button);
-  gtk_button_set_relief (GTK_BUTTON (cw->priv->pickup_button), GTK_RELIEF_NONE);
-  gtk_widget_show (cw->priv->pickup_button);
+  gtk_container_add (GTK_CONTAINER (cw->priv->pick_up_button), image);
+  gtk_container_add (GTK_CONTAINER (item), cw->priv->pick_up_button);
+  gtk_button_set_relief (GTK_BUTTON (cw->priv->pick_up_button), GTK_RELIEF_NONE);
+  gtk_widget_show (cw->priv->pick_up_button);
   gtk_toolbar_insert (GTK_TOOLBAR (cw->priv->call_panel_toolbar),
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pickup_button), false);
+  gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->pick_up_button), false);
   gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
 				  _("Pick up the current call"));
-  g_signal_connect (cw->priv->pickup_button, "clicked",
-		    G_CALLBACK (pickup_call_cb), cw);
+  g_signal_connect (cw->priv->pick_up_button, "clicked",
+		    G_CALLBACK (pick_up_call_cb), cw);
 
   /* Hang up */
   item = gtk_tool_item_new ();
-  cw->priv->hangup_button = gtk_button_new ();
+  cw->priv->hang_up_button = gtk_button_new ();
   image = gtk_image_new_from_icon_name ("phone-hang-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
-  gtk_container_add (GTK_CONTAINER (cw->priv->hangup_button), image);
-  gtk_container_add (GTK_CONTAINER (item), cw->priv->hangup_button);
-  gtk_button_set_relief (GTK_BUTTON (cw->priv->hangup_button), GTK_RELIEF_NONE);
-  gtk_widget_show (cw->priv->hangup_button);
+  gtk_container_add (GTK_CONTAINER (cw->priv->hang_up_button), image);
+  gtk_container_add (GTK_CONTAINER (item), cw->priv->hang_up_button);
+  gtk_button_set_relief (GTK_BUTTON (cw->priv->hang_up_button), GTK_RELIEF_NONE);
+  gtk_widget_show (cw->priv->hang_up_button);
   gtk_toolbar_insert (GTK_TOOLBAR (cw->priv->call_panel_toolbar),
 		      GTK_TOOL_ITEM (item), -1);
-  gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hangup_button), false);
+  gtk_widget_set_sensitive (GTK_WIDGET (cw->priv->hang_up_button), false);
   gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item),
 				  _("Hang up the current call"));
-  g_signal_connect (cw->priv->hangup_button, "clicked",
-		    G_CALLBACK (hangup_call_cb), cw);
+  g_signal_connect (cw->priv->hang_up_button, "clicked",
+		    G_CALLBACK (hang_up_call_cb), cw);
 
   /* Separator */
   item = gtk_separator_tool_item_new ();
diff --git a/lib/engine/protocol/call.h b/lib/engine/protocol/call.h
index f0eaa81..74f1742 100644
--- a/lib/engine/protocol/call.h
+++ b/lib/engine/protocol/call.h
@@ -73,9 +73,9 @@ namespace Ekiga
        * Call Management
        */
 
-      /** Hangup the call
+      /** Hang up the call
       */
-      virtual void hangup () = 0;
+      virtual void hang_up () = 0;
 
       /** Answer an incoming call
       */
diff --git a/plugins/libnotify/libnotify-main.cpp b/plugins/libnotify/libnotify-main.cpp
index b604bbe..b4ea8f2 100644
--- a/plugins/libnotify/libnotify-main.cpp
+++ b/plugins/libnotify/libnotify-main.cpp
@@ -92,7 +92,7 @@ call_notification_action_cb (NotifyNotification *notification,
   if (!strcmp (action, "accept"))
     call->answer ();
   else
-    call->hangup ();
+    call->hang_up ();
 }
 
 static void
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 318ed5a..15eca4b 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1173,7 +1173,7 @@ ekiga_main_window_init_uri_toolbar (EkigaMainWindow *mw)
   gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), FALSE);
 
   gtk_widget_set_tooltip_text (GTK_WIDGET (call_button),
-			       _("Enter a URI on the left, and click this button to place a call or to hangup"));
+			       _("Enter a URI on the left, and click this button to place a call or to hang up"));
 
   gtk_toolbar_insert (GTK_TOOLBAR (mw->priv->uri_toolbar), item, -1);