[xine-cvs] CVS: gnome-xine/src gtkvideo.c,1.45,1.46 main.c,1.121,1.122 open_mrl.c,1.16,1.17 post.c,1.23,1.24

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

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

Modified Files:
	gtkvideo.c main.c open_mrl.c post.c 
Log Message:
Minor fixes, mostly compile warnings.

Index: gtkvideo.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gtkvideo.c	25 Apr 2005 21:54:25 -0000	1.45
+++ gtkvideo.c	6 May 2005 18:23:19 -0000	1.46
@@ -846,7 +846,7 @@
   unsigned long        black_pixel;
   gtk_video_private_t *priv;
 
-  static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 };
+  static char bm_no_data[] = { 0,0,0,0, 0,0,0,0 };
 
   g_return_if_fail(widget != NULL);
   g_return_if_fail(GTK_IS_VIDEO(widget));

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- main.c	4 May 2005 01:02:11 -0000	1.121
+++ main.c	6 May 2005 18:23:19 -0000	1.122
@@ -221,7 +221,7 @@
 
 int main(int argc, char* argv[])
 {
-  int opt, enqueue, fullscreen, optstate;
+  int enqueue, fullscreen, optstate;
   gboolean show_splash = TRUE;
 
 #ifndef GLIB_USES_SYSTEM_MALLOC
@@ -246,7 +246,7 @@
     gtk_rc_add_default_file (file);
     g_free (file);
     gtk_rc_add_default_file (GXINE_CONFDIR "/gtkrc");
-    file = g_strconcat (getenv ("HOME"), "/.gxine/gtkrc", NULL);
+    file = g_strconcat (g_get_home_dir (), "/.gxine/gtkrc", NULL);
     if (*file)
       gtk_rc_add_default_file (file);
     g_free (file);
@@ -294,7 +294,6 @@
       { "no-splash", no_argument, NULL, 'S' },
       { NULL }
     };
-    int thisopt = optind ? : 1;
     int index = 0;
     int opt = getopt_long (argc, argv, OPTS, longopts, &index);
 #else

Index: open_mrl.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/open_mrl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- open_mrl.c	4 May 2005 01:02:12 -0000	1.16
+++ open_mrl.c	6 May 2005 18:23:20 -0000	1.17
@@ -87,9 +87,9 @@
       if (slash == colon + 1)
       {
 	int prefix_l = slash - prefix + 1;
-	mrl = g_strdup_printf ("%.*s%s", prefix_l, prefix, mrl);
-	gtk_entry_set_text (GTK_ENTRY(mrl_entry), mrl);
-	free (mrl);
+	char *start = g_strdup_printf ("%.*s%s", prefix_l, prefix, mrl);
+	gtk_entry_set_text (GTK_ENTRY(mrl_entry), start);
+	free (start);
 	gtk_editable_select_region (GTK_EDITABLE(mrl_entry), 0, prefix_l);
       }
       else
@@ -165,6 +165,7 @@
 
   mrl_entry = gtk_entry_new ();
   gtk_box_pack_start (GTK_BOX(hbox), mrl_entry, TRUE, TRUE, 2);
+  gtk_entry_set_activates_default (GTK_ENTRY(mrl_entry), TRUE);
 
   gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (mrl_dialog)->vbox), hbox);
 

Index: post.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/post.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- post.c	23 Apr 2005 20:55:34 -0000	1.23
+++ post.c	6 May 2005 18:23:20 -0000	1.24
@@ -427,9 +427,9 @@
   for (i = j = 0; i < length; ++i)
     if (text[i] >= ' ' && text[i] != ';')
       newtext[j++] = text[i];
-  g_signal_handlers_block_by_func (widget, (gpointer)text_insert_cb, data);
+  g_signal_handlers_block_by_func (widget, text_insert_cb, data);
   gtk_editable_insert_text (widget, newtext, j, position);
-  g_signal_handlers_unblock_by_func (widget, (gpointer)text_insert_cb, data);
+  g_signal_handlers_unblock_by_func (widget, text_insert_cb, data);
   g_signal_stop_emission_by_name (widget, "insert-text");
   free (newtext);
 }