From 10dcb8c3e1fec5c6f20ef30ed62eb40b5bc0e0e5 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 26 Oct 2009 16:44:54 -0400
Subject: [PATCH] [#2347] Use GNOME user settings for Menu and Toolbar
appareance
---
sflphone-client-gnome/src/mainwindow.c | 12 +++++++-----
sflphone-client-gnome/src/mainwindow.h | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index 22e34cfb84..44209fbc91 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -198,7 +198,13 @@ create_main_window ()
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
widget = create_toolbar_actions (ui_manager);
- gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
+ // Do not override GNOME user settings
+ // gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+
+ widget = create_toolbar_windows (ui_manager);
+ // Do not override GNOME user settings
+ //gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
@@ -211,10 +217,6 @@ create_main_window ()
gtk_box_pack_start(GTK_BOX(subvbox),
GTK_WIDGET(embedded_error_notebook), FALSE, FALSE, 0);
- widget = create_toolbar_windows (ui_manager);
- gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_ICONS);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-
if(SHOW_VOLUME){
speaker_control = create_slider("speaker");
gtk_box_pack_end (GTK_BOX (subvbox), speaker_control, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
diff --git a/sflphone-client-gnome/src/mainwindow.h b/sflphone-client-gnome/src/mainwindow.h
index aea6763bcf..323c0893a9 100644
--- a/sflphone-client-gnome/src/mainwindow.h
+++ b/sflphone-client-gnome/src/mainwindow.h
@@ -24,7 +24,7 @@
#include <calltree.h>
#include <uimanager.h>
-#define MAIN_WINDOW_WIDTH 400
+#define MAIN_WINDOW_WIDTH 350
#define MAIN_WINDOW_HEIGHT 320
/** @file mainwindow.h
--
GitLab