From 3cbac2dd558c1e3d4402641fbc11501638d349ac Mon Sep 17 00:00:00 2001 From: "eric.beuque" Date: Sun, 11 Apr 2010 16:56:54 +0000 Subject: [PATCH] =?UTF-8?q?[FreetuxTV]=20Renommage=20du=20fichier=20de=20l?= =?UTF-8?q?a=20liste=20des=20logos=20en=20liste=20des=20cha=C3=AEnes=20TV.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Makefile.am | 4 +-- src/freetuxtv-channels-list.c | 4 +-- src/freetuxtv-logos-list.h | 34 ------------------ ...os-list.c => freetuxtv-tv-channels-list.c} | 35 ++++++++++--------- src/freetuxtv-tv-channels-list.h | 35 +++++++++++++++++++ src/freetuxtv-window-main.c | 4 +-- src/main.c | 8 ++--- 7 files changed, 63 insertions(+), 61 deletions(-) delete mode 100644 src/freetuxtv-logos-list.h rename src/{freetuxtv-logos-list.c => freetuxtv-tv-channels-list.c} (85%) create mode 100644 src/freetuxtv-tv-channels-list.h diff --git a/src/Makefile.am b/src/Makefile.am index 593751f..aae4412 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/freetuxtv-channels-list.c b/src/freetuxtv-channels-list.c index eb0d1a6..f1f881c 100644 --- a/src/freetuxtv-channels-list.c +++ b/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){ diff --git a/src/freetuxtv-logos-list.h b/src/freetuxtv-logos-list.h deleted file mode 100644 index 47b803c..0000000 --- a/src/freetuxtv-logos-list.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- 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 - * (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. - * - */ - -#ifndef FREETUXTV_LOGOS_LIST_H -#define FREETUXTV_LOGOS_LIST_H - -#include "freetuxtv-app.h" -#include "freetuxtv-db-sync.h" - -void -logos_list_synchronize (FreetuxTVApp *app, DBSync *dbsync, - GError** error); - -gchar* -logos_list_get_channel_logo_filename(FreetuxTVApp *app, - FreetuxTVChannelInfos* channel_infos, - gboolean none_icon); - -#endif /* FREETUXTV_LOGOS_LIST_H */ diff --git a/src/freetuxtv-logos-list.c b/src/freetuxtv-tv-channels-list.c similarity index 85% rename from src/freetuxtv-logos-list.c rename to src/freetuxtv-tv-channels-list.c index b60d224..6a25df4 100644 --- a/src/freetuxtv-logos-list.c +++ b/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 + * + * 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 . */ #include -#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) { diff --git a/src/freetuxtv-tv-channels-list.h b/src/freetuxtv-tv-channels-list.h new file mode 100644 index 0000000..fec346d --- /dev/null +++ b/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 + * + * 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 . + */ + +#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 */ diff --git a/src/freetuxtv-window-main.c b/src/freetuxtv-window-main.c index 543f412..46cbeca 100644 --- a/src/freetuxtv-window-main.c +++ b/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){ diff --git a/src/main.c b/src/main.c index 4c997fd..20e8674 100644 --- a/src/main.c +++ b/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 @@ -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,