Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>

        * collect-table.c, dupe.c, exif.c, img-view.c info.c, layout_image.c,
        md5-util.[ch], pan-view.c, remote.c, search.c, thumb_standard.c,
        ui_bookmark.c, ui_misc.c, ui_pathsel.c, view_dir_list.c,
        view_dir_tree.c, view_file_icon.c, view_file_list.c: Fix signedness
        warnings in gcc 4.0.

diff --git a/ChangeLog b/ChangeLog
index cd3e576..efc4568 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug 15 17:13:57 2005  John Ellis  <johne@verizon.net>
+
+       * collect-table.c, dupe.c, exif.c, img-view.c info.c, layout_image.c,
+       md5-util.[ch], pan-view.c, remote.c, search.c, thumb_standard.c,
+       ui_bookmark.c, ui_misc.c, ui_pathsel.c, view_dir_list.c,
+       view_dir_tree.c, view_file_icon.c, view_file_list.c: Fix signedness
+       warnings in gcc 4.0.
+
 Mon Aug 15 16:35:15 2005  John Ellis  <johne@verizon.net>
 
        * view_dir_tree.c (vdtree_set_path): Do not force reading folder

diff --git a/src/collect-table.c b/src/collect-table.c
index 81757ff..08137dc 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -2058,7 +2058,7 @@ static void collection_table_dnd_get(GtkWidget *widget, GdkDragContext *context,
                }
 
        gtk_selection_data_set(selection_data, selection_data->target,
-                              8, uri_text, total);
+                              8, (guchar *)uri_text, total);
        g_free(uri_text);
 }
 
@@ -2075,7 +2075,7 @@ static void collection_table_dnd_receive(GtkWidget *widget, GdkDragContext *cont
        CollectInfo *drop_info;
        GList *work;
 
-       if (debug) printf(selection_data->data);
+       if (debug) printf("%s\n", selection_data->data);
 
        collection_table_scroll(ct, FALSE);
        collection_table_insert_marker(ct, NULL, FALSE);
@@ -2118,7 +2118,7 @@ static void collection_table_dnd_receive(GtkWidget *widget, GdkDragContext *cont
                                }
                        break;
                case TARGET_URI_LIST:
-                       list = uri_list_from_text(selection_data->data, TRUE);
+                       list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                        work = list;
                        while (work)
                                {

diff --git a/src/dupe.c b/src/dupe.c
index a37d8bc..a4433ca 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -3354,7 +3354,7 @@ static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
                }
 
        if (uri_text) gtk_selection_data_set(selection_data, selection_data->target,
-                                            8, uri_text, length);
+                                            8, (guchar *)uri_text, length);
        g_free(uri_text);
 }
 
@@ -3379,7 +3379,7 @@ static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
                        collection_from_dnd_data((gchar *)selection_data->data, &list, NULL);
                        break;
                case TARGET_URI_LIST:
-                       list = uri_list_from_text(selection_data->data, TRUE);
+                       list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                        work = list;
                        while(work)
                                {

diff --git a/src/exif.c b/src/exif.c
index 267c2b9..982b4ea 100644 (file)
--- a/src/exif.c
+++ b/src/exif.c
@@ -973,10 +973,10 @@ static gint jpeg_goto_next_marker(unsigned char **data, gint *size, gint *marker
 }
 
 
-static gint exif_parse_JPEG(ExifData *exif, unsigned char *data, guint size, ExifMarker *list)
+static gint exif_parse_JPEG(ExifData *exif, unsigned char *data, gint size, ExifMarker *list)
 {
-       guint marker;
-       guint marker_size;
+       gint marker;
+       gint marker_size;
 
        if (size < 4 || *data != 0xFF || *(data + 1) != MARKER_SOI)
                {

diff --git a/src/img-view.c b/src/img-view.c
index 2da0f53..65e9e16 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1392,7 +1392,7 @@ static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
                        {
                        GList *work;
 
-                       list = uri_list_from_text(selection_data->data, TRUE);
+                       list = uri_list_from_text((gchar *)selection_data->data, TRUE);
 
                        work = list;
                        while (work)
@@ -1481,7 +1481,7 @@ static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
                if (text)
                        {
                        gtk_selection_data_set (selection_data, selection_data->target,
-                                               8, text, len);
+                                               8, (guchar *)text, len);
                        g_free(text);
                        }
                }

diff --git a/src/info.c b/src/info.c
index b3653d7..daed421 100644 (file)
--- a/src/info.c
+++ b/src/info.c
@@ -507,7 +507,7 @@ static void info_window_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
                g_list_free(list);
 
                gtk_selection_data_set(selection_data, selection_data->target,
-                                      8, text, len);
+                                      8, (guchar *)text, len);
                g_free(text);
                }
 }

diff --git a/src/layout_image.c b/src/layout_image.c
index 0db14ca..c7c5056 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -816,7 +816,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
 
                if (info == TARGET_URI_LIST)
                        {
-                       list = uri_list_from_text(selection_data->data, TRUE);
+                       list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                        source = NULL;
                        info_list = NULL;
                        }
@@ -901,7 +901,7 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context,
                if (text)
                        {
                        gtk_selection_data_set (selection_data, selection_data->target,
-                                               8, text, len);
+                                               8, (guchar *)text, len);
                        g_free(text);
                        }
                }

diff --git a/src/md5-util.c b/src/md5-util.c
index a66ab26..0f186c6 100644 (file)
--- a/src/md5-util.c
+++ b/src/md5-util.c
@@ -315,7 +315,7 @@ md5_transform (guint32 buf[4], const guint32 in[16])
  * the 16 bytes buffer @digest .
  **/
 void
-md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])
+md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16])
 {      
        MD5Context ctx;
 

diff --git a/src/md5-util.h b/src/md5-util.h
index dfc0fee..d919383 100644 (file)
--- a/src/md5-util.h
+++ b/src/md5-util.h
@@ -42,7 +42,7 @@ void md5_update (MD5Context *ctx, const guchar *buf, guint32 len);
 void md5_final (MD5Context *ctx, guchar digest[16]);
 
 /* generate digest from memory buffer */
-void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);
+void md5_get_digest (const guchar *buffer, gint buffer_size, guchar digest[16]);
 
 /* generate digest from file */
 gboolean md5_get_digest_from_file(const gchar *path, guchar digest[16]);

diff --git a/src/pan-view.c b/src/pan-view.c
index 8aebb79..4cd4408 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -4833,7 +4833,7 @@ static void pan_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
                {
                GList *list;
 
-               list = uri_list_from_text(selection_data->data, TRUE);
+               list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                if (list && isdir((gchar *)list->data))
                        {
                        gchar *path = list->data;
@@ -4876,7 +4876,7 @@ static void pan_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
                if (text)
                        {
                        gtk_selection_data_set (selection_data, selection_data->target,
-                                               8, text, len);
+                                               8, (guchar *)text, len);
                        g_free(text);
                        }
                }

diff --git a/src/remote.c b/src/remote.c
index 2f438d7..8d040fe 100644 (file)
--- a/src/remote.c
+++ b/src/remote.c
@@ -52,7 +52,7 @@ static gboolean remote_server_client_cb(GIOChannel *source, GIOCondition conditi
                GList *work;
                gchar *buffer = NULL;
                GError *error = NULL;
-               gint termpos;
+               guint termpos;
 
                while (g_io_channel_read_line(source, &buffer, NULL, &termpos, &error) == G_IO_STATUS_NORMAL)
                        {
@@ -153,7 +153,7 @@ static gboolean remote_server_read_cb(GIOChannel *source, GIOCondition condition
 {
        RemoteConnection *rc = data;
        int fd;
-       int alen;
+       unsigned int alen;
 
        fd = accept(rc->fd, NULL, &alen);
        if (fd == -1)

diff --git a/src/search.c b/src/search.c
index 3a7a45f..f50b52c 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1371,7 +1371,7 @@ static void search_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
                }
 
        if (uri_text) gtk_selection_data_set(selection_data, selection_data->target,
-                                            8, uri_text, length);
+                                            8, (guchar *)uri_text, length);
        g_free(uri_text);
 }
 

diff --git a/src/thumb_standard.c b/src/thumb_standard.c
index a4711a7..20a247a 100644 (file)
--- a/src/thumb_standard.c
+++ b/src/thumb_standard.c
@@ -153,7 +153,7 @@ static gchar *thumb_std_cache_path(const gchar *path, const gchar *uri, gint loc
                cache_base = g_strconcat(homedir(), "/", THUMB_FOLDER, "/", cache_subfolder, NULL);
                }
 
-       md5_get_digest(uri, strlen(uri), digest);
+       md5_get_digest((guchar *)uri, strlen(uri), digest);
        md5_text = md5_digest_to_text(digest);
 
        if (cache_base && md5_text)

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index 367efda..2987151 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -809,7 +809,7 @@ static void bookmark_drag_set_data(GtkWidget *button,
        if (!uri_text) return;
 
        gtk_selection_data_set(selection_data, selection_data->target,
-                              8, uri_text, length);
+                              8, (guchar *)uri_text, length);
        g_free(uri_text);
 }
 
@@ -1003,7 +1003,7 @@ static void bookmark_dnd_get_data(GtkWidget *widget,
                {
                case TARGET_URI_LIST:
                case TARGET_X_URL:
-                       list = uri_list_from_text(selection_data->data, FALSE);
+                       list = uri_list_from_text((gchar *)selection_data->data, FALSE);
                        break;
                }
 

diff --git a/src/ui_misc.c b/src/ui_misc.c
index c895219..38873c8 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -899,7 +899,7 @@ static gint date_selection_popup_press_cb(GtkWidget *widget, GdkEventButton *eve
 
 static void date_selection_popup_sync(DateSelection *ds)
 {
-       gint day, month, year;
+       guint day, month, year;
 
        gtk_calendar_get_date(GTK_CALENDAR(ds->calendar), &year, &month, &day);
        date_selection_set(ds->box, day, month + 1, year);

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index 6291f60..562d834 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -353,7 +353,7 @@ static void dest_dnd_set_data(GtkWidget *view,
        if (!uri_text) return;
 
        gtk_selection_data_set(selection_data, selection_data->target,
-                              8, uri_text, length);
+                              8, (guchar *)uri_text, length);
        g_free(uri_text);
 }
 

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index e771da1..beca255 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -481,7 +481,7 @@ static void vdlist_dnd_get(GtkWidget *widget, GdkDragContext *context,
        if (text)
                {
                gtk_selection_data_set (selection_data, selection_data->target,
-                               8, text, length);
+                               8, (guchar *)text, length);
                g_free(text);
                }
 }
@@ -537,7 +537,7 @@ static void vdlist_dnd_drop_receive(GtkWidget *widget,
                GList *list;
                gint active;
 
-               list = uri_list_from_text(selection_data->data, TRUE);
+               list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                if (!list) return;
 
                active = access_file(fd->path, W_OK | X_OK);

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index abab10b..552235b 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -559,7 +559,7 @@ static void vdtree_dnd_get(GtkWidget *widget, GdkDragContext *context,
        if (uri_text)
                {
                gtk_selection_data_set(selection_data, selection_data->target,
-                                      8, uri_text, length);
+                                      8, (guchar *)uri_text, length);
                g_free(uri_text);
                }
 }
@@ -613,7 +613,7 @@ static void vdtree_dnd_drop_receive(GtkWidget *widget,
                GList *list;
                gint active;
 
-               list = uri_list_from_text(selection_data->data, TRUE);
+               list = uri_list_from_text((gchar *)selection_data->data, TRUE);
                if (!list) return;
 
                active = access_file(fd->path, W_OK | X_OK);

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index ba98ebc..43f2fe0 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -613,7 +613,7 @@ static void vficon_dnd_get(GtkWidget *widget, GdkDragContext *context,
        if (debug) printf(uri_text);
 
        gtk_selection_data_set(selection_data, selection_data->target,
-                              8, uri_text, total);
+                              8, (guchar *)uri_text, total);
        g_free(uri_text);
 }
 

diff --git a/src/view_file_list.c b/src/view_file_list.c
index 780e0d2..10f58bb 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -138,7 +138,8 @@ static void vflist_dnd_get(GtkWidget *widget, GdkDragContext *context,
 
        if (debug) printf(uri_text);
 
-       gtk_selection_data_set(selection_data, selection_data->target, 8, uri_text, total);
+       gtk_selection_data_set(selection_data, selection_data->target,
+                              8, (guchar *)uri_text, total);
        g_free(uri_text);
 }