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

Support new GtkStatusbar layout and the old layout

Browse source
This commit is contained in:
Christian Dywan 2009-11-17 18:51:38 +01:00
parent d3e5d1af23
commit 3fc0c192fd
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
midori/midori-browser.c
View file

@ -5379,6 +5379,7 @@ midori_browser_init (MidoriBrowser* browser)
GtkWidget* vpaned; GtkWidget* vpaned;
GtkToolItem* toolitem; GtkToolItem* toolitem;
GtkRcStyle* rcstyle; GtkRcStyle* rcstyle;
GtkWidget* label;
GtkWidget* scrolled; GtkWidget* scrolled;
GtkWidget* icon; GtkWidget* icon;
@ -5858,20 +5859,22 @@ midori_browser_init (MidoriBrowser* browser)
browser->statusbar = gtk_statusbar_new (); browser->statusbar = gtk_statusbar_new ();
/* Rearrange the statusbar packing. This is necessariy to keep /* Rearrange the statusbar packing. This is necessariy to keep
themes happy while there is no support from GtkStatusbar. */ themes happy while there is no support from GtkStatusbar. */
#if 1 label = GTK_STATUSBAR (browser->statusbar)->label;
if (GTK_IS_BOX (gtk_widget_get_parent (label)))
browser->statusbar_contents = gtk_widget_get_parent (label);
else
{
browser->statusbar_contents = gtk_hbox_new (FALSE, 4); browser->statusbar_contents = gtk_hbox_new (FALSE, 4);
gtk_widget_show (browser->statusbar_contents); gtk_widget_show (browser->statusbar_contents);
g_object_ref (GTK_STATUSBAR (browser->statusbar)->label); g_object_ref (GTK_STATUSBAR (browser->statusbar)->label);
gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), gtk_container_remove (
GTK_STATUSBAR (browser->statusbar)->label); GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), label);
gtk_box_pack_start (GTK_BOX (browser->statusbar_contents), gtk_box_pack_start (GTK_BOX (browser->statusbar_contents),
GTK_STATUSBAR (browser->statusbar)->label, TRUE, TRUE, 0); label, TRUE, TRUE, 0);
g_object_unref (GTK_STATUSBAR (browser->statusbar)->label); g_object_unref (label);
gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame), gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (browser->statusbar)->frame),
browser->statusbar_contents); browser->statusbar_contents);
#else }
browser->statusbar_contents = browser->statusbar;
#endif
gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), browser->statusbar, FALSE, FALSE, 0);
browser->progressbar = gtk_progress_bar_new (); browser->progressbar = gtk_progress_bar_new ();