aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shortcut.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2d392d1d88..53459c828c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-04 Ettore Perazzoli <ettore@helixcode.com>
+
+ * e-shortcut.c (shell_icon_cb): Type of @url changed from `gchar
+ *' to `const gchar *'; new arg @data.
+ (e_shortcut_bar_view_new): Pass NULL as the closure value for
+ `e_shortcut_bar_set_icon_callback()'.
+
2000-05-02 Ettore Perazzoli <ettore@helixcode.com>
* e-folder-mail.c: Removed.
diff --git a/shell/e-shortcut.c b/shell/e-shortcut.c
index d066394049..ed09abe932 100644
--- a/shell/e-shortcut.c
+++ b/shell/e-shortcut.c
@@ -360,7 +360,7 @@ static struct {
#define NSHELL_ICONS (sizeof (shell_icons) / sizeof (shell_icons[0]))
static GdkPixbuf *
-shell_icon_cb (EShortcutBar *shortcut_bar, gchar *url)
+shell_icon_cb (EShortcutBar *shortcut_bar, const gchar *url, gpointer data)
{
int i;
@@ -402,7 +402,7 @@ e_shortcut_bar_view_new (EShortcutBarModel *bm)
shortcut_bar = e_shortcut_bar_new ();
e_shortcut_bar_set_icon_callback (E_SHORTCUT_BAR (shortcut_bar),
- shell_icon_cb);
+ shell_icon_cb, NULL);
gtk_widget_pop_visual ();
gtk_widget_pop_colormap ();