[xine-cvs] CVS: gnome-xine/src desktop_integration.c,1.10,1.11 script_engine.c,1.51,1.52 globals.h,1.28,1.29

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

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

Modified Files:
	desktop_integration.c script_engine.c globals.h 
Log Message:
Move gxine-logo.png into /usr/[local/]share/pixmaps (for WM menus).

Index: desktop_integration.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/desktop_integration.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- desktop_integration.c	29 Jun 2005 18:18:41 -0000	1.10
+++ desktop_integration.c	6 Jul 2005 18:49:19 -0000	1.11
@@ -473,13 +473,13 @@
 	   "Comment=Play films and songs, or watch digital TV\n"
 	   "MultipleArgs=true\n"
 	   "Terminal=false\n"
-	   "Icon=%s/gxine-icon.xpm\n"
+	   "Icon=%s/gxine-logo.png\n"
 	   "Exec=%s/gxine\n"
 	   "Type=Application\n"
 	   "StartupNotify=true\n"
 	   "Categories=GTK;Application;AudioVideo;\n"
 	   "MimeType=",
-	   pixmapdir,
+	   icondir,
 	   bindir);
 
   /*

Index: script_engine.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/script_engine.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- script_engine.c	30 Jun 2005 00:09:19 -0000	1.51
+++ script_engine.c	6 Jul 2005 18:49:19 -0000	1.52
@@ -261,9 +261,6 @@
     GtkWidget *label;
     GtkBox *vbox;
     const gchar *translator = _("TRANSLATOR");
-    gchar *file = g_strconcat (pixmapdir, "/gxine-logo.png", NULL);
-    GdkPixbuf *logo = gdk_pixbuf_new_from_file (file, NULL);
-    g_free (file);
 
     about = gtk_about_dialog_new ();
     g_object_set (G_OBJECT(about),
@@ -292,7 +289,7 @@
 	"documenters", documenters,
 	"translator-credits",
 	  strcmp (translator, "TRANSLATOR") ? translator : NULL,
-	"logo", logo,
+	"logo", gxine_logo,
 	NULL);
 
     label = gtk_label_new ("<small><i>" VENDOR_PKG_VERSION "</i></small>");

Index: globals.h
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/globals.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- globals.h	8 Jun 2005 20:12:22 -0000	1.28
+++ globals.h	6 Jul 2005 18:49:20 -0000	1.29
@@ -48,6 +48,8 @@
 extern GSList	      *infobars;
 extern pthread_mutex_t engine_lock;
 
+extern GdkPixbuf      *gxine_logo;
+
 typedef struct {
   GtkToggleAction *fullscreen, *resize_factor, *auto_resize, *auto_rescale,
 		  *deinterlace, *vo_postproc, *ao_postproc, *toolbar;
@@ -59,7 +61,7 @@
 extern xine_t         *xine;
 extern xine_stream_t  *stream;
 extern se_t           *gse; /* global script engine */
-extern gchar *plugindir, *bindir, *logodir, *pixmapdir, *miscdir;
+extern gchar *plugindir, *bindir, *logodir, *pixmapdir, *icondir, *miscdir;
 extern char           *audio_driver_id;
 extern char           *video_driver_id;
 extern xine_audio_port_t *audio_port;