aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthetroublemaker <thetroublemaker@inventati.org>2006-01-08 23:22:01 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-08 23:22:01 +0800
commit1271be0b624c6657fb57661042099d8f6ef540a0 (patch)
treed6940b3ab05a9ed3418733f12af440a4d22cc502
parent59442d11a620383fa54ab0416f4a7257dc50543c (diff)
downloadgsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar.gz
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar.bz2
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar.lz
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar.xz
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.tar.zst
gsoc2013-epiphany-1271be0b624c6657fb57661042099d8f6ef540a0.zip
changed ephy_tab_get_title_composite to ephy_tab_get_title, so that now
2006-01-05 thetroublemaker <thetroublemaker@inventati.org> * src/ephy-notebook.c: changed ephy_tab_get_title_composite to ephy_tab_get_title, so that now 'Loading ' is not displayed when loadin' a new tab. Bug #323468.
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-notebook.c6
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fdbabeba..8c0c3380d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-05 thetroublemaker <thetroublemaker@inventati.org>
+
+ * src/ephy-notebook.c:
+
+ changed ephy_tab_get_title_composite to ephy_tab_get_title,
+ so that now 'Loading ' is not displayed when loadin' a new
+ tab. Bug #323468.
+
2006-01-08 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-window.c: (ephy_window_delete_event):
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index cd13b09b9..2cb8bb293 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -1007,7 +1007,7 @@ sync_label (EphyTab *tab, GParamSpec *pspec, GtkWidget *proxy)
g_return_if_fail (ebox != NULL && tips != NULL && label != NULL);
- title = ephy_tab_get_title_composite (tab);
+ title = ephy_tab_get_title (tab);
if (title)
{
@@ -1032,6 +1032,7 @@ tab_label_style_set_cb (GtkWidget *hbox,
{
PangoFontMetrics *metrics;
PangoContext *context;
+ GtkWidget *button;
int char_width, h, w;
context = gtk_widget_get_pango_context (hbox);
@@ -1047,6 +1048,9 @@ tab_label_style_set_cb (GtkWidget *hbox,
gtk_widget_set_size_request
(hbox, TAB_WIDTH_N_CHARS * PANGO_PIXELS(char_width) + 2 * w, -1);
+
+ button = g_object_get_data (G_OBJECT (hbox), "close-button");
+ gtk_widget_set_size_request (button, w + 2, h + 2);
}
static GtkWidget *