[FreetuxTV] Renommage du fichier de la liste des logos en liste des c…

…haînes TV.

src/Makefile.am

@@ -30,14 +30,14 @@ freetuxtv_SOURCES = \
 	freetuxtv-fileutils.c \
 	freetuxtv-fileutils.h \
 	freetuxtv-i18n.h \
-	freetuxtv-logos-list.c \
-	freetuxtv-logos-list.h \
 	freetuxtv-models.c \
 	freetuxtv-models.h \
 	freetuxtv-recordings-list.c \
 	freetuxtv-recordings-list.h \
 	freetuxtv-tv-channel-infos.h \
 	freetuxtv-tv-channel-infos.c\
+	freetuxtv-tv-channels-list.c \
+	freetuxtv-tv-channels-list.h \
 	freetuxtv-utils.c \
 	freetuxtv-utils.h \
 	freetuxtv-window-main.c \

src/freetuxtv-channels-list.c

@@ -28,7 +28,7 @@
 #include "freetuxtv-channel-infos.h"
 #include "freetuxtv-channels-group-infos.h"
 #include "freetuxtv-cellrenderer-channelslist.h"
-#include "freetuxtv-logos-list.h"
+#include "freetuxtv-tv-channels-list.h"
 #include "freetuxtv-db-sync.h"
 #include "lib-m3uparser.h"
 
@@ -692,7 +692,7 @@ on_row_displayed_channels_list(GtkTreeViewColumn *col,
 		gtk_tree_model_get(model, iter, CHANNEL_COLUMN, &channel_infos, -1);  
 
 		gchar *imgfile;
-		imgfile = logos_list_get_channel_logo_filename(app, channel_infos, TRUE);
+		imgfile = tvchannels_list_get_tvchannel_logo_path(app, channel_infos, TRUE);
 
 		gboolean is_playing = FALSE;
 		if(app->current.path_channel != NULL){

src/freetuxtv-logos-list.c → src/freetuxtv-tv-channels-list.c

@@ -1,24 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4-*- */
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * FreetuxTV is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2010 <[email protected]>
+ * 
+ * freetuxtv is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * FreetuxTV is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Glade; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
+ * 
+ * freetuxtv is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtk.h>
 
-#include "freetuxtv-logos-list.h"
+#include "freetuxtv-tv-channels-list.h"
 
 #include "freetuxtv-app.h"
 #include "freetuxtv-i18n.h"
@@ -54,7 +55,7 @@ xml_text_cb(GMarkupParseContext *context,
     GError **error);
 
 void
-logos_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
+tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
     GError** error)
 {
 	g_return_if_fail(dbsync != NULL);
@@ -95,7 +96,7 @@ logos_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
 }
 
 gchar*
-logos_list_get_channel_logo_filename(FreetuxTVApp *app, 
+tvchannels_list_get_tvchannel_logo_path(FreetuxTVApp *app, 
     FreetuxTVChannelInfos* channel_infos,
     gboolean none_icon)
 {

src/freetuxtv-tv-channels-list.h

@@ -0,0 +1,35 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * freetuxtv
+ * Copyright (C) Eric Beuque 2010 <[email protected]>
+ * 
+ * freetuxtv is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * freetuxtv is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FREETUXTV_TV_CHANNELS_LIST_H
+#define FREETUXTV_TV_CHANNELS_LIST_H
+
+#include "freetuxtv-app.h"
+#include "freetuxtv-db-sync.h"
+
+void
+tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
+    GError** error);
+
+gchar*
+tvchannels_list_get_tvchannel_logo_path(FreetuxTVApp *app, 
+    FreetuxTVChannelInfos* channel_infos,
+    gboolean none_icon);
+
+#endif /* FREETUXTV_TV_CHANNELS_LIST_H */

src/freetuxtv-window-main.c

@@ -28,7 +28,7 @@
 #include "freetuxtv-utils.h"
 #include "freetuxtv-channels-list.h"
 #include "freetuxtv-channels-group-infos.h"
-#include "freetuxtv-logos-list.h"
+#include "freetuxtv-tv-channels-list.h"
 #include "freetuxtv-db-sync.h"
 #include "freetuxtv-models.h"
 
@@ -984,7 +984,7 @@ on_windowmain_menuitemupdatetvchannels_activate (GtkMenuItem *menuitem,
 	dbsync_open_db (&dbsync, &error);
 
 	if(error == NULL){
-		logos_list_synchronize (app, &dbsync, &error);			
+		tvchannels_list_synchronize (app, &dbsync, &error);			
 	}
 
 	if(error == NULL){

src/main.c

@@ -31,7 +31,7 @@
 #include "freetuxtv-window-recording.h"
 #include "freetuxtv-channels-list.h"
 #include "freetuxtv-recordings-list.h"
-#include "freetuxtv-logos-list.h"
+#include "freetuxtv-tv-channels-list.h"
 #include "freetuxtv-models.h"
 #include <gtk-libvlc-media-player.h>
 
@@ -387,7 +387,7 @@ splashscreen_app_init(gpointer data)
 		struct stat file_stat;
 		if(g_stat (FREETUXTV_DIR "/channels_logos.xml", &file_stat) == 0){
 			if(app->config.logosfiledate < (gint)file_stat.st_mtime){
-				logos_list_synchronize(app, &dbsync, &error);
+				tvchannels_list_synchronize(app, &dbsync, &error);
 				if(error == NULL){
 					app->config.logosfiledate = (gint)file_stat.st_mtime;	
 				}
@@ -546,7 +546,7 @@ freetuxtv_play_channel (FreetuxTVApp *app, GtkTreePath* path_channel)
 
 		// Send notification to desktop
 		gchar *imgfile;
-		imgfile = logos_list_get_channel_logo_filename(app, channel_infos, TRUE);
+		imgfile = tvchannels_list_get_tvchannel_logo_path(app, channel_infos, TRUE);
 
 		if(app->prefs.enable_notifications){
 			notify_notification_update (app->current.notification, channel_infos->name,
@@ -692,7 +692,7 @@ freetuxtv_action_record (FreetuxTVApp *app)
 
 		// Send notification to desktop
 		gchar *imgfile;
-		imgfile = logos_list_get_channel_logo_filename(app, channel_infos, TRUE);
+		imgfile = tvchannels_list_get_tvchannel_logo_path(app, channel_infos, TRUE);
 
 		if(app->prefs.enable_notifications){
 			notify_notification_update (app->current.notification, channel_infos->name,