summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2012-02-25 17:05:44 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2012-02-25 17:05:44 +0000
commit38cfefac61212bd40a828db4c8e937809d6f2f75 (patch)
tree841ddb876b19296f1b24adaf8c9725ec0e91d336 /src
parentGDL: Replace deprecated GRelation API (diff)
downloadinkscape-38cfefac61212bd40a828db4c8e937809d6f2f75.tar.gz
inkscape-38cfefac61212bd40a828db4c8e937809d6f2f75.zip
GDL: Merge upstream patch 912AE (2012-02-20) - Fixed some const warnings
(bzr r11014)
Diffstat (limited to 'src')
-rw-r--r--src/libgdl/gdl-switcher.c8
-rw-r--r--src/libgdl/gdl-switcher.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c
index 78ba1168d..60d53dd5f 100644
--- a/src/libgdl/gdl-switcher.c
+++ b/src/libgdl/gdl-switcher.c
@@ -50,7 +50,7 @@ static void gdl_switcher_add_button (GdlSwitcher *switcher,
const gchar *label,
const gchar *tooltips,
const gchar *stock_id,
- const GdkPixbuf *pixbuf_icon,
+ GdkPixbuf *pixbuf_icon,
gint switcher_id,
GtkWidget *page);
/* static void gdl_switcher_remove_button (GdlSwitcher *switcher, gint switcher_id); */
@@ -779,10 +779,10 @@ gdl_switcher_new (void)
return GTK_WIDGET (switcher);
}
-void
+static void
gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
const gchar *tooltips, const gchar *stock_id,
- const GdkPixbuf *pixbuf_icon,
+ GdkPixbuf *pixbuf_icon,
gint switcher_id, GtkWidget* page)
{
GtkWidget *event_box;
@@ -890,7 +890,7 @@ gint
gdl_switcher_insert_page (GdlSwitcher *switcher, GtkWidget *page,
GtkWidget *tab_widget, const gchar *label,
const gchar *tooltips, const gchar *stock_id,
- const GdkPixbuf *pixbuf_icon, gint position)
+ GdkPixbuf *pixbuf_icon, gint position)
{
gint ret_position;
gint switcher_id;
diff --git a/src/libgdl/gdl-switcher.h b/src/libgdl/gdl-switcher.h
index 991f2da20..0caf3a0aa 100644
--- a/src/libgdl/gdl-switcher.h
+++ b/src/libgdl/gdl-switcher.h
@@ -60,7 +60,7 @@ gint gdl_switcher_insert_page (GdlSwitcher *switcher,
const gchar *label,
const gchar *tooltips,
const gchar *stock_id,
- const GdkPixbuf *pixbuf_icon,
+ GdkPixbuf *pixbuf_icon,
gint position);
G_END_DECLS