From 1d364491c1dfce0e22d84a23ac0c24d996311b25 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 12 Sep 2013 14:32:48 -0400
Subject: [PATCH] * #29977: gnome: always put volume controls above dialpad

---
 gnome/src/mainwindow.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnome/src/mainwindow.c b/gnome/src/mainwindow.c
index d9a61d18b1..ed3328cf41 100644
--- a/gnome/src/mainwindow.c
+++ b/gnome/src/mainwindow.c
@@ -320,6 +320,12 @@ create_main_window(SFLPhoneClient *client)
     g_object_ref(speaker_control);
     g_object_ref(mic_control);
 
+    if (g_settings_get_boolean(client->settings, "show-dialpad")) {
+        dialpad = create_dialpad(client);
+        gtk_box_pack_end(GTK_BOX(subvbox), dialpad, FALSE, TRUE, 0);
+        gtk_widget_show_all(dialpad);
+    }
+
     if (must_show_volume(client)) {
         gtk_box_pack_end(GTK_BOX(subvbox), speaker_control, FALSE, TRUE, 0);
         gtk_box_pack_end(GTK_BOX(subvbox), mic_control, FALSE, TRUE, 0);
@@ -330,11 +336,6 @@ create_main_window(SFLPhoneClient *client)
         gtk_widget_hide(mic_control);
     }
 
-    if (g_settings_get_boolean(client->settings, "show-dialpad")) {
-        dialpad = create_dialpad(client);
-        gtk_box_pack_end(GTK_BOX(subvbox), dialpad, FALSE, TRUE, 0);
-        gtk_widget_show_all(dialpad);
-    }
 
     /* Status bar */
     statusBar = gtk_statusbar_new();
-- 
GitLab