debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Default to Icons in the toolbar on Win32

Browse source
This commit is contained in:
Christian Dywan 2009-07-20 06:54:46 +02:00
parent 8bbc25695a
commit 572383370f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-browser.c
View file

@ -172,6 +172,10 @@ static void
midori_browser_new_history_item (MidoriBrowser* browser, midori_browser_new_history_item (MidoriBrowser* browser,
KatzeItem* item); KatzeItem* item);
static void
_midori_browser_set_toolbar_style (MidoriBrowser* browser,
MidoriToolbarStyle toolbar_style);
static GtkAction* static GtkAction*
_action_by_name (MidoriBrowser* browser, _action_by_name (MidoriBrowser* browser,
const gchar* name) const gchar* name)
@ -2286,16 +2290,9 @@ midori_browser_navigationbar_notify_style_cb (GObject* object,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
MidoriToolbarStyle toolbar_style; MidoriToolbarStyle toolbar_style;
GtkToolbarStyle gtk_toolbar_style;
g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL); g_object_get (browser->settings, "toolbar-style", &toolbar_style, NULL);
if (toolbar_style == MIDORI_TOOLBAR_DEFAULT) _midori_browser_set_toolbar_style (browser, toolbar_style);
{
g_object_get (object,
"gtk-toolbar-style", &gtk_toolbar_style, NULL);
gtk_toolbar_set_style (GTK_TOOLBAR (browser->navigationbar),
gtk_toolbar_style);
}
} }
static gboolean static gboolean
@ -5198,7 +5195,11 @@ _midori_browser_set_toolbar_style (MidoriBrowser* browser,
GtkToolbarStyle gtk_toolbar_style; GtkToolbarStyle gtk_toolbar_style;
GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser)); GtkSettings* gtk_settings = gtk_widget_get_settings (GTK_WIDGET (browser));
if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings) if (toolbar_style == MIDORI_TOOLBAR_DEFAULT && gtk_settings)
#ifdef G_OS_WIN32
gtk_toolbar_style = GTK_TOOLBAR_ICONS;
#else
g_object_get (gtk_settings, "gtk-toolbar-style", &gtk_toolbar_style, NULL); g_object_get (gtk_settings, "gtk-toolbar-style", &gtk_toolbar_style, NULL);
#endif
else else
{ {
switch (toolbar_style) switch (toolbar_style)