[Xfce4-commits] r22622 - xfmedia/trunk/src

[Brian Tarricone]

Author: kelnos
Date: 2006-08-02 06:57:49 +0000 (Wed, 02 Aug 2006)
New Revision: 22622

Modified:
   xfmedia/trunk/src/mainwin-callbacks.c
   xfmedia/trunk/src/mainwin.c
   xfmedia/trunk/src/mediamarks.c
   xfmedia/trunk/src/playlist.c
   xfmedia/trunk/src/settings-dialog.c
   xfmedia/trunk/src/xfmedia-common.c
   xfmedia/trunk/src/xfmedia-handle.c
   xfmedia/trunk/src/xfmedia-icon.h
   xfmedia/trunk/src/xfmedia-stock-icons.h
Log:
fix a bunch of gcc4 warnings


Modified: xfmedia/trunk/src/mainwin-callbacks.c
===================================================================
--- xfmedia/trunk/src/mainwin-callbacks.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/mainwin-callbacks.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -1325,8 +1325,10 @@
     }
     
     toplevel = gtk_widget_get_toplevel(GTK_WIDGET(mwin->window));
-    chooser = gtk_file_chooser_dialog_new(_("Add Media File"), GTK_WINDOW(toplevel),
-            GTK_FILE_CHOOSER_ACTION_OPEN, NULL);
+    chooser = gtk_file_chooser_dialog_new(_("Add Media File"),
+                                          GTK_WINDOW(toplevel),
+                                          GTK_FILE_CHOOSER_ACTION_OPEN,
+                                          NULL, NULL);
     btn = xfmedia_custom_button_new(_("Add _Selected"), GTK_STOCK_ADD);
     gtk_widget_show(btn);
     gtk_dialog_add_action_widget(GTK_DIALOG(chooser), btn, GTK_RESPONSE_APPLY);

Modified: xfmedia/trunk/src/mainwin.c
===================================================================
--- xfmedia/trunk/src/mainwin.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/mainwin.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -1648,7 +1648,7 @@
 {
     gchar *filename;
     gboolean ret = FALSE;
-    gint idx_start = -1, idx_end = -1;
+    guint idx_start = 0, idx_end = 0;
     
     if(idx == -1) {
         idx = mainwin_get_next_index(mwin, -1);

Modified: xfmedia/trunk/src/mediamarks.c
===================================================================
--- xfmedia/trunk/src/mediamarks.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/mediamarks.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -342,7 +342,7 @@
     gint fd;
 #endif
     gchar *file_contents = NULL;
-    gint file_length;
+    guint file_length;
     GMarkupParser parser = {
         mediamarks_xml_start, mediamarks_xml_end, NULL, NULL, NULL
     };

Modified: xfmedia/trunk/src/playlist.c
===================================================================
--- xfmedia/trunk/src/playlist.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/playlist.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -1197,7 +1197,7 @@
         
         drag_success = TRUE;
     } else if(data->target == _STRING) {
-        gchar *filename = g_strdup(data->data);
+        gchar *filename = g_strdup((gchar *)data->data);
         gint from_index = -1;
         
         if(gtk_tree_view_get_dest_row_at_pos(GTK_TREE_VIEW(plist->priv->treeview),

Modified: xfmedia/trunk/src/settings-dialog.c
===================================================================
--- xfmedia/trunk/src/settings-dialog.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/settings-dialog.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -588,7 +588,7 @@
 {
     static GtkWidget *win = NULL;
     GtkWidget *topvbox, *vbox, *hbox, *btn, *frame, *frame_bin, *entry, *lbl,
-              *combo, *notebook, *menu, *mi, *cb;
+              *combo, *notebook, *menu, *cb;
     GtkTooltips *ttips;
     struct SDData *sddata;
     GList *vis_plugins;

Modified: xfmedia/trunk/src/xfmedia-common.c
===================================================================
--- xfmedia/trunk/src/xfmedia-common.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/xfmedia-common.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -373,7 +373,7 @@
 {
     gchar *utf8 = NULL;
     const gchar *charset = NULL;
-    gint read = 0, written = 0;
+    guint read = 0, written = 0;
     GError *err = NULL;
     
     if(!g_utf8_validate(string, -1, NULL)) {

Modified: xfmedia/trunk/src/xfmedia-handle.c
===================================================================
--- xfmedia/trunk/src/xfmedia-handle.c	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/xfmedia-handle.c	2006-08-02 06:57:49 UTC (rev 22622)
@@ -111,9 +111,9 @@
     GdkBitmap *dark_bmap;
 };
 
-static const guint8 dark_bits[] = { 0x00, 0x0e, 0x02, 0x02, 0x00, 0x00, };
-static const guint8 light_bits[] = { 0x00, 0x00, 0x10, 0x10, 0x1c, 0x00, };
-static const guint8 mid_bits[] = { 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, };
+static const gchar dark_bits[] = { 0x00, 0x0e, 0x02, 0x02, 0x00, 0x00, };
+static const gchar light_bits[] = { 0x00, 0x00, 0x10, 0x10, 0x1c, 0x00, };
+static const gchar mid_bits[] = { 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, };
 
 
 G_DEFINE_TYPE(XfmediaHandle, xfmedia_handle, GTK_TYPE_WIDGET);

Modified: xfmedia/trunk/src/xfmedia-icon.h
===================================================================
--- xfmedia/trunk/src/xfmedia-icon.h	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/xfmedia-icon.h	2006-08-02 06:57:49 UTC (rev 22622)
@@ -8,6 +8,7 @@
   48, /* width */
   48, /* height */
   /* pixel_data: */
+  (guint8 *)
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"

Modified: xfmedia/trunk/src/xfmedia-stock-icons.h
===================================================================
--- xfmedia/trunk/src/xfmedia-stock-icons.h	2006-08-02 06:45:45 UTC (rev 22621)
+++ xfmedia/trunk/src/xfmedia-stock-icons.h	2006-08-02 06:57:49 UTC (rev 22622)
@@ -8,6 +8,7 @@
   24, /* width */
   24, /* height */
   /* pixel_data: */
+  (guint8 *)
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"