[FreetuxTV] Glib log integration in GMMKeys.

muzena · Jul 17, 2010 · 5b60655 · 5b60655
1 parent edf636b
commit 5b60655
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 414 deletions.
diff --git a/src/freetuxtv-app.h b/src/freetuxtv-app.h
@@ -117,6 +117,10 @@ freetuxtv_action_deinterlace (FreetuxTVApp *app, const gchar* mode,
 void
 freetuxtv_quit (FreetuxTVApp *app);
 
+void
+freetuxtv_log (const gchar *log_domain, GLogLevelFlags log_level,
+               const gchar *message, gpointer user_data);
+
 G_END_DECLS
 
 #endif /* FREETUXTV_APP_H */
diff --git a/src/freetuxtv-channels-list.c b/src/freetuxtv-channels-list.c
@@ -266,14 +266,16 @@ channels_list_refresh_channels_group (FreetuxTVApp *app, GtkTreePath *path_group
 	text = g_strdup_printf(_("Update \"%s\" channels list"), pChannelsGroupInfos->name);
 	windowmain_statusbar_push (app, "UpdateMsg", text);
 	g_free(text);
-	g_print("FreetuxTV : Start updating \"%s\" channels list\n", pChannelsGroupInfos->name);
+	g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+	      "Start updating \"%s\" channels list\n", pChannelsGroupInfos->name);
 
 	if(pChannelsGroupInfos->type == FREETUXTV_CHANNELSGROUP_TYPEGROUP_PLAYLIST){
 		// Get the file of the playlist
 		text = g_strdup_printf (_("Getting the file : \"%s\""), pChannelsGroupInfos->uri);
 		windowmain_statusbar_push (app, "UpdateMsg", text);
 		g_free(text);
-		g_print("FreetuxTV : Getting the file \"%s\"\n", pChannelsGroupInfos->uri);
+		g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+		      "Getting the file \"%s\"\n", pChannelsGroupInfos->uri);
 
 		gchar *filename = NULL;
 		channels_group_get_file (pChannelsGroupInfos, &filename, TRUE, error);		
@@ -293,7 +295,8 @@ channels_list_refresh_channels_group (FreetuxTVApp *app, GtkTreePath *path_group
 			pdata.error = error;
 			int res = 0;
 
-			g_print("FreetuxTV : Parsing the file \"%s\"\n", filename);
+			g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+			      "Parsing the file \"%s\"\n", filename);
 			res = libm3uparser_parse(filename, &on_parsem3u_add_channel, &pdata);
 			if (res != LIBM3UPARSER_OK){		
 				if (res != LIBM3UPARSER_CALLBACK_RETURN_ERROR){
@@ -388,7 +391,8 @@ channels_list_delete_channels_group (FreetuxTVApp *app, GtkTreePath *path_group,
 		if(*error == NULL){
 			channels_group_get_file (pChannelsGroupInfos, &filename, TRUE, error);
 
-			g_print("FreetuxTV : Deleting the file \"%s\"\n", filename);
+			g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_INFO,
+			      "Deleting the file \"%s\"\n", filename);
 			if(g_unlink(filename)){
 
 			}
@@ -1262,7 +1266,8 @@ on_popupmenu_activated_addfavourites (GtkMenuItem *menuitem, gpointer user_data)
 			gtk_tree_model_get (app->channelslist, &treeiter, CHANNEL_COLUMN, &pOriginalChannelInfos, -1);
 
 			if(pOriginalChannelInfos){
-				g_print("adding '%s' to group '%s'\n", pOriginalChannelInfos->name, pFavouritesChannelsGroupInfos->name);
+				g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+				      "Adding '%s' to favourites group '%s'\n", pOriginalChannelInfos->name, pFavouritesChannelsGroupInfos->name);
 
 				// Copy the channel and add it in database
 				pChannelInfos = freetuxtv_channel_infos_new (pOriginalChannelInfos->name, pOriginalChannelInfos->url);

diff --git a/src/freetuxtv-db-sync.c b/src/freetuxtv-db-sync.c
@@ -455,7 +455,6 @@ dbsync_add_channel (DBSync *dbsync,
 	    );
 
 	res = sqlite3_exec(dbsync->db_link, query, NULL, NULL, &db_err);
-	//g_print("%s\n", query);
 	sqlite3_free(query);
 
 	if(vlc_options){

diff --git a/src/freetuxtv-tv-channels-list.c b/src/freetuxtv-tv-channels-list.c
@@ -66,7 +66,8 @@ tvchannels_list_synchronize (FreetuxTVApp *app, DBSync *dbsync,
 	text = g_strdup_printf(_("Synchronizing the tv channels list"));
 	windowmain_statusbar_push (app, "UpdateMsg", text);
 	g_free(text);
-	g_print("FreetuxTV : Synchronizing the tv channels list\n");
+	g_log(FREETUXTV_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE,
+	      "Synchronizing the tv channels list\n");
 
 	// Delete the TV channel in the database
 	dbsync_delete_tvchannels (dbsync, error);

diff --git a/src/freetuxtv-window-add-channels-group.c b/src/freetuxtv-window-add-channels-group.c
@@ -620,7 +620,6 @@ on_buttonadd_clicked (GtkButton *button, gpointer user_data)
 					gtk_tree_path_free(priv->pLastAddedChannelsGroupPath);
 				}
 				priv->pLastAddedChannelsGroupPath = pTreePathTmp;
-				// g_print("added %s\n", gtk_tree_path_to_string (pTreePathTmp));
 
 				tmptext = g_strdup_printf(_("%d channels group(s) have been successfully added."), 1);
 				gtk_progress_dialog_set_text(pProgressDialog, tmptext);