summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/gtkext/easygtk.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 387f2cb..62d4587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+15-09-02 Cyrille Bagard <nocbos@gmail.com>
+
+ * src/gtkext/easygtk.c:
+ Fix two GCC warnings when using GTK.
+
15-09-01 Cyrille Bagard <nocbos@gmail.com>
* po/fr.po:
diff --git a/src/gtkext/easygtk.c b/src/gtkext/easygtk.c
index 61e8953..77b29bd 100644
--- a/src/gtkext/easygtk.c
+++ b/src/gtkext/easygtk.c
@@ -434,7 +434,7 @@ static void _finish_button_with_img(GtkWidget *button, GObject *object, const ch
if (picture != NULL && label != NULL)
{
- hbox = gtk_hbox_new(FALSE, 2);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_show(hbox);
gtk_container_add(GTK_CONTAINER(button), hbox);
@@ -932,7 +932,7 @@ void add_accelerator_to_menu_item(GtkWidget *item, const char *accelerator, GtkA
return TRUE;
}
- g_signal_connect(item, "can-activate-accel", force_accel_activation, NULL);
+ g_signal_connect(item, "can-activate-accel", G_CALLBACK(force_accel_activation), NULL);
gtk_widget_add_accelerator(item, "activate", group,
key, mods, GTK_ACCEL_VISIBLE);