aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--src/bookmarks/ephy-bookmark-action.c21
2 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a45046540..c8625a052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2003-05-08 David Adam Bordoley <bordoley@msu.edu>
+ * src/bookmarks/ephy-bookmark-action.c:
+ (ephy_bookmark_action_sync_icon),
+ (ephy_bookmark_action_sync_label):
+
+ Don't set an icon unless their is a favicon.
+ Append a colon onto the label of smartbookmarks.
+
+2003-05-08 David Adam Bordoley <bordoley@msu.edu>
+
* TODO:
* data/glade/epiphany.glade:
* data/glade/prefs-dialog.glade:
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 196a05e36..ebb8565f4 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <libgnome/gnome-i18n.h>
+
#include "ephy-bookmark-action.h"
#include "ephy-bookmarks.h"
#include "ephy-shell.h"
@@ -153,25 +155,30 @@ ephy_bookmark_action_sync_icon (EggAction *action, GParamSpec *pspec, GtkWidget
gtk_image_set_from_pixbuf (icon, pixbuf);
g_object_unref (pixbuf);
}
- else
- {
- gtk_image_set_from_stock (icon,
- GTK_STOCK_JUMP_TO,
- GTK_ICON_SIZE_MENU);
- }
}
static void
ephy_bookmark_action_sync_label (EggAction *action, GParamSpec *pspec, GtkWidget *proxy)
{
GtkLabel *label;
+ gchar *toolbar_label;
LOG ("Set bookmark action proxy label to %s", action->label)
label = GTK_LABEL (g_object_get_data (G_OBJECT (proxy), "label"));
g_return_if_fail (label != NULL);
- gtk_label_set_label (label, action->label);
+ if (EPHY_BOOKMARK_ACTION (action)->priv->smart_url)
+ {
+ toolbar_label = g_strdup_printf (_("%s:"), action->label);
+ }
+ else
+ {
+ toolbar_label = g_strdup (action->label);
+ }
+
+ gtk_label_set_label (label, toolbar_label);
+ g_free (toolbar_label);
}
static void