From 4cbe991d80bda7d01894f905d3738ec827a25b6d Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 22 Mar 2014 16:25:15 +0100 Subject: fix some compile warnings --- src/file-manager/fm-directory-view.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 79378f5a..37639554 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -9706,7 +9706,7 @@ fm_directory_view_unmerge_menus (FMDirectoryView *view) } static void -disconnect_handler (GObject *object, int *id) +disconnect_handler (GObject *object, guint *id) { if (*id != 0) { g_signal_handler_disconnect (object, *id); @@ -9715,13 +9715,13 @@ disconnect_handler (GObject *object, int *id) } static void -disconnect_directory_handler (FMDirectoryView *view, int *id) +disconnect_directory_handler (FMDirectoryView *view, guint *id) { disconnect_handler (G_OBJECT (view->details->model), id); } static void -disconnect_directory_as_file_handler (FMDirectoryView *view, int *id) +disconnect_directory_as_file_handler (FMDirectoryView *view, guint *id) { disconnect_handler (G_OBJECT (view->details->directory_as_file), id); } -- cgit v1.2.1 From e0d7a6b033f7ae2bbd504af86aec009def16d6d5 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 22 Mar 2014 19:11:48 +0100 Subject: fix a wrong guint argument --- eel/eel-editable-label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index c5802bf2..54ed3087 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -2079,7 +2079,7 @@ eel_editable_label_select_region_index (EelEditableLabel *label, { GtkTargetList *list; GtkTargetEntry *targets; - guint n_targets; + gint n_targets; list = gtk_target_list_new (NULL, 0); gtk_target_list_add_text_targets (list, 0); -- cgit v1.2.1 From a395859226fd2532b5a8a59757c460ccbd26ded0 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 22 Mar 2014 19:13:58 +0100 Subject: fix some g_thread_init deprecations --- test/test-caja-search-engine.c | 4 +++- test/test-copy.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/test-caja-search-engine.c b/test/test-caja-search-engine.c index 6a4ace70..6695f916 100644 --- a/test/test-caja-search-engine.c +++ b/test/test-caja-search-engine.c @@ -34,7 +34,9 @@ main (int argc, char* argv[]) CajaSearchEngine *engine; CajaQuery *query; - g_thread_init (NULL); +#if !GLIB_CHECK_VERSION (2, 32, 0) + g_thread_init (NULL); +#endif gtk_init (&argc, &argv); diff --git a/test/test-copy.c b/test/test-copy.c index 5eaab1e5..81407812 100644 --- a/test/test-copy.c +++ b/test/test-copy.c @@ -45,7 +45,9 @@ main (int argc, char* argv[]) GList *infos; CajaProgressInfo *progress_info; - g_thread_init (NULL); +#if !GLIB_CHECK_VERSION (2, 32, 0) + g_thread_init (NULL); +#endif test_init (&argc, &argv); -- cgit v1.2.1 From c966485816928ad8aa4b135815fa918bcef46837 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 22 Mar 2014 22:10:13 +0100 Subject: fix g_atomic_int_exchange_and_add deprecations --- eel/eel-string.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eel/eel-string.c b/eel/eel-string.c index fd733f88..3a8f2581 100644 --- a/eel/eel-string.c +++ b/eel/eel-string.c @@ -988,7 +988,11 @@ retry_atomic_decrement: { G_LOCK (unique_ref_strs); /* Need to recheck after taking lock to avoid races with _get_unique() */ +#if !GLIB_CHECK_VERSION (2, 30, 0) if (g_atomic_int_exchange_and_add (count, -1) == 0x80000001) +#else + if (g_atomic_int_add (count, -1) == 0x80000001) +#endif { g_hash_table_remove (unique_ref_strs, (char *)str); g_free ((char *)count); -- cgit v1.2.1 From a2ab27abdf58a2910b1c24b2612cee0e1052418c Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 22 Mar 2014 22:13:47 +0100 Subject: fix missing guchar argument in eel-gdk-pixbuf-extensions.c --- eel/eel-gdk-pixbuf-extensions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c index 6870e932..b4cd9394 100644 --- a/eel/eel-gdk-pixbuf-extensions.c +++ b/eel/eel-gdk-pixbuf-extensions.c @@ -51,7 +51,7 @@ struct EelPixbufLoadHandle EelPixbufLoadCallback callback; gpointer callback_data; GdkPixbufLoader *loader; - char buffer[LOAD_BUFFER_SIZE]; + guchar buffer[LOAD_BUFFER_SIZE]; }; GdkPixbuf * @@ -112,7 +112,7 @@ GdkPixbuf * eel_gdk_pixbuf_load_from_stream_at_size (GInputStream *stream, int size) { - char buffer[LOAD_BUFFER_SIZE]; + guchar buffer[LOAD_BUFFER_SIZE]; gssize bytes_read; GdkPixbufLoader *loader; GdkPixbuf *pixbuf; -- cgit v1.2.1