aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-03-09 08:32:34 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-03-09 08:32:34 +0800
commit054c98c402cf486d55185ba286d5415b47bf4db7 (patch)
treed455bc56a1d6976da99ac8d74cf224112e3d74c7
parent8129584f01c3756626d0b8f38284f197e1e2f822 (diff)
downloadgsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar.gz
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar.bz2
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar.lz
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar.xz
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.tar.zst
gsoc2013-epiphany-054c98c402cf486d55185ba286d5415b47bf4db7.zip
Code cleanup from galeon
2003-03-09 Marco Pesenti Gritti <marco@it.gnome.org> * lib/widgets/ephy-spinner.c: (ephy_spinner_expose), (bump_spinner_frame), (ephy_spinner_class_init): Code cleanup from galeon * src/bookmarks/ephy-bookmarks-editor.c: (ephy_bookmarks_editor_construct): s/Title/Bookmark, should be more clear
-rw-r--r--ChangeLog12
-rw-r--r--lib/widgets/ephy-spinner.c23
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
3 files changed, 17 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 45e4a614d..c333729fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-09 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * lib/widgets/ephy-spinner.c: (ephy_spinner_expose),
+ (bump_spinner_frame), (ephy_spinner_class_init):
+
+ Code cleanup from galeon
+
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (ephy_bookmarks_editor_construct):
+
+ s/Title/Bookmark, should be more clear
+
2003-03-08 Dan Damian <dand@level7.ro>
* lib/ephy-debug.h: (LOG) Added a space before comma. Fixes a
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index aaa43746a..3144f3fbf 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -252,9 +252,8 @@ ephy_spinner_expose (GtkWidget *widget, GdkEventExpose *event)
g_return_val_if_fail (IS_EPHY_SPINNER (widget), FALSE);
spinner = EPHY_SPINNER (widget);
- if (!spinner->details->ready) {
- return FALSE;
- }
+
+ if (!GTK_WIDGET_DRAWABLE (spinner)) return TRUE;
pixbuf = select_spinner_image (spinner);
if (pixbuf == NULL) {
@@ -292,18 +291,6 @@ ephy_spinner_expose (GtkWidget *widget, GdkEventExpose *event)
return FALSE;
}
-static void
-ephy_spinner_map (GtkWidget *widget)
-{
- EphySpinner *spinner;
-
- spinner = EPHY_SPINNER (widget);
-
- GTK_WIDGET_CLASS (parent_class)->map (widget);
-
- spinner->details->ready = TRUE;
-}
-
/* here's the actual timeout task to bump the frame and schedule a redraw */
static gboolean
@@ -312,9 +299,8 @@ bump_spinner_frame (gpointer callback_data)
EphySpinner *spinner;
spinner = EPHY_SPINNER (callback_data);
- if (!spinner->details->ready) {
- return TRUE;
- }
+
+ if (!GTK_WIDGET_DRAWABLE (spinner)) return TRUE;
spinner->details->current_frame += 1;
if (spinner->details->current_frame > spinner->details->max_frame - 1) {
@@ -551,7 +537,6 @@ ephy_spinner_class_init (EphySpinnerClass *class)
widget_class->expose_event = ephy_spinner_expose;
widget_class->size_request = ephy_spinner_size_request;
- widget_class->map = ephy_spinner_map;
}
static EphySpinnerInfo *
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index d8668865e..fafe08aa9 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -719,7 +719,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
bm_view = ephy_node_view_new (node, editor->priv->bookmarks_filter);
ephy_node_view_enable_drag_source (bm_view);
ephy_node_view_add_icon_column (bm_view, EPHY_TREE_MODEL_NODE_COL_ICON);
- ephy_node_view_add_column (bm_view, _("Title"),
+ ephy_node_view_add_column (bm_view, _("Bookmarks"),
EPHY_TREE_MODEL_NODE_COL_BOOKMARK, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (bm_view), TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (bm_view));