[xine-cvs] CVS: gnome-xine/src engine.c,1.20,1.21 main.c,1.146,1.147 menu.c,1.64,1.65 open_mrl.c,1.25,1.26 player.c,1.51,1.52 server.c,1.17,1.18 xml_widgets.c,1.8,1.9

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6002/src

Modified Files:
	engine.c main.c menu.c open_mrl.c player.c server.c 
	xml_widgets.c 
Log Message:
Minor clean up (compiler warnings).

Index: engine.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/engine.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- engine.c	15 Aug 2005 02:42:05 -0000	1.20
+++ engine.c	14 Oct 2005 17:54:41 -0000	1.21
@@ -49,7 +49,7 @@
 static gboolean modified = FALSE;
 
 
-static void print_cb (void *user_data, char *str, ...)
+static void print_cb (void *user_data, const char *str, ...)
 {
   if (verbosity)
   {

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- main.c	13 Oct 2005 23:47:01 -0000	1.146
+++ main.c	14 Oct 2005 17:54:42 -0000	1.147
@@ -236,7 +236,8 @@
   /* set up our gtkrc stuff */
   {
     gchar **file = gtk_rc_get_default_files ();
-    gchar **copy, *home = g_get_home_dir ();
+    gchar **copy;
+    const gchar *home = g_get_home_dir ();
     guint homelen = strlen (home);
     guint length = 0, i;
     while (file[length])
@@ -490,12 +491,12 @@
     }
 
     if (first < 0)
-      gtk_init_add (playlist_logo, NULL);
+      gtk_init_add ((GtkFunction) playlist_logo, NULL);
     else
       gtk_init_add (main_start_play,  &first);
   }
   else
-    gtk_init_add (playlist_logo, NULL);
+    gtk_init_add ((GtkFunction) playlist_logo, NULL);
 
   if (fullscreen)
     engine_exec ("vo_fullscreen.v = true;", NULL, NULL, NULL);

Index: menu.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- menu.c	26 Sep 2005 21:02:42 -0000	1.64
+++ menu.c	14 Oct 2005 17:54:42 -0000	1.65
@@ -84,7 +84,7 @@
   return (tree >= 0 && tree < G_N_ELEMENTS(type)) ? type[tree] : NULL;
 }
 
-static void autoplay_cb (GtkAction *action, gpointer data)
+static void autoplay_cb (GtkAction *action, const char *data)
 {
   char **mrls;
   int    n, i, pos;

Index: open_mrl.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/open_mrl.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- open_mrl.c	5 Oct 2005 21:01:25 -0000	1.25
+++ open_mrl.c	14 Oct 2005 17:54:42 -0000	1.26
@@ -52,8 +52,9 @@
 
 static void open_mrl_response_cb (GtkDialog *dbox, int response, gpointer data)
 {
-  const gchar  *mrl;
-  int           item;
+  gchar *mrl;
+  const gchar *cmrl;
+  int item;
   switch (response)
   {
   case 1:
@@ -87,14 +88,14 @@
     break;
 
   case GTK_RESPONSE_OK:
-    mrl = gtk_entry_get_text (GTK_ENTRY (mrl_entry));
-    if (mrl)
+    cmrl = gtk_entry_get_text (GTK_ENTRY (mrl_entry));
+    if (cmrl)
     {
-      while (isspace (*mrl))
-	++mrl;
-      if (*mrl)
+      while (isspace (*cmrl))
+	++cmrl;
+      if (*cmrl)
       {
-	item = playlist_add_mrl (mrl, -1);
+	item = playlist_add_mrl (cmrl, -1);
 	playlist_play (item); /* then hide */
       }
     }

Index: player.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/player.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- player.c	21 Sep 2005 17:12:19 -0000	1.51
+++ player.c	14 Oct 2005 17:54:44 -0000	1.52
@@ -558,7 +558,7 @@
   {
     scale_changed_cb (NULL, zoom, NULL);
     do_pending_events ();
-    gtk_video_rescale (gtv, zoom);
+    gtk_video_rescale ((GtkVideo *) gtv, zoom);
   }
 
   return JS_TRUE;

Index: server.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/server.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- server.c	13 Jul 2005 22:51:09 -0000	1.17
+++ server.c	14 Oct 2005 17:54:44 -0000	1.18
@@ -139,7 +139,7 @@
   }
 }
 
-static void error_report (void *s, char *msg, ...) {
+static void error_report (void *s, const char *msg, ...) {
 
   int fd = *(int *)s;
   char *amsg;

Index: xml_widgets.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/xml_widgets.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xml_widgets.c	6 Oct 2005 19:31:41 -0000	1.8
+++ xml_widgets.c	14 Oct 2005 17:54:44 -0000	1.9
@@ -265,6 +265,7 @@
 }
 #endif
 
+#ifndef MAKE_TRANSLATION_SOURCE
 static int
 parse_attach (xml_node_t *node, const char *attr, int dflt)
 {
@@ -296,6 +297,7 @@
   }
   return value;
 }
+#endif
 
 /* Common properties:
  *	NAME		TYPE	DEFAULT	COMMENT
@@ -1085,7 +1087,7 @@
     {
       struct widget_ref *w = widget_id->data;
       if (strcasecmp (w->id, ref->id))
-	gtk_label_set_mnemonic_widget (ref->object, w->object);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (ref->object), w->object);
     }
     free (ref);
   }