aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessio Treglia <quadrispro@ubuntu.com>2016-02-28 19:59:51 (GMT)
committerAlessio Treglia <quadrispro@ubuntu.com>2016-02-28 19:59:51 (GMT)
commit4eb63b2c593141e76f6085d18624784477bdddd2 (patch)
treef0f6ca8db88a0946eac488c26ca97cbe4bb58704
parent332ddd40e9e1ae71bc6e27adfbc9d9c5c4aefe5c (diff)
parent30d2d34664524151426212d62185d6f116b17e39 (diff)
Merge pull request #1 from alessio/fix-crash-on-64bit-sys-when-adding-a-filter
Prevent crash on 64-bit systems
-rw-r--r--src/camorama-window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 815c6cf..47c04fa 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -42,7 +42,7 @@ static GQuark menu_item_filter_type = 0;
static void
add_filter_clicked(GtkMenuItem* menuitem, CamoramaFilterChain* chain) {
- GType filter_type = GPOINTER_TO_INT(g_object_get_qdata(G_OBJECT(menuitem), menu_item_filter_type));
+ GType filter_type = GPOINTER_TO_SIZE(g_object_get_qdata(G_OBJECT(menuitem), menu_item_filter_type));
camorama_filter_chain_append(chain, filter_type);
}
@@ -124,7 +124,7 @@ show_popup(cam* cam, GtkTreeView* treeview, GdkEventButton* ev) {
}
item = gtk_menu_item_new_with_label(filter_name);
- g_object_set_qdata(G_OBJECT(item), menu_item_filter_type, GINT_TO_POINTER(filters[i]));
+ g_object_set_qdata(G_OBJECT(item), menu_item_filter_type, GSIZE_TO_POINTER(filters[i]));
g_signal_connect(item, "activate",
G_CALLBACK(add_filter_clicked), model);
gtk_container_add(GTK_CONTAINER(add_filters), item);

Privacy Policy