[rygel] core,plugins: Fix bgo#629348
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core,plugins: Fix bgo#629348
- Date: Sat, 11 Sep 2010 13:34:38 +0000 (UTC)
commit 836c8f5b614de93f56c5de1111e7c536e330a339
Author: Jens Georg <mail jensge org>
Date: Sat Sep 11 15:33:21 2010 +0200
core,plugins: Fix bgo#629348
Don't translate debug messages. Patch provided by Gabor Kelement
.../media-export/rygel-media-export-database.vala | 2 +-
.../media-export/rygel-media-export-harvester.vala | 2 +-
.../rygel-media-export-media-cache.vala | 4 ++--
.../rygel-media-export-metadata-extractor.vala | 2 +-
.../rygel-media-export-recursive-file-monitor.vala | 2 +-
.../rygel-media-export-root-container.vala | 2 +-
src/plugins/mpris/rygel-mpris-player.vala | 2 +-
src/plugins/playbin/rygel-playbin-player.vala | 6 +++---
.../tracker/rygel-tracker-insertion-query.vala | 2 +-
.../tracker/rygel-tracker-selection-query.vala | 2 +-
src/rygel/rygel-av-transport.vala | 2 +-
src/rygel/rygel-changelog.vala | 2 +-
src/rygel/rygel-http-get.vala | 2 +-
src/rygel/rygel-http-server.vala | 8 ++++----
src/rygel/rygel-import-resource.vala | 2 +-
src/rygel/rygel-main.vala | 6 +++---
src/rygel/rygel-plugin-loader.vala | 8 ++++----
src/rygel/rygel-root-device-factory.vala | 2 +-
src/rygel/rygel-search.vala | 2 +-
src/rygel/rygel-user-config.vala | 4 ++--
20 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-database.vala b/src/plugins/media-export/rygel-media-export-database.vala
index dc6c4f5..21c0f13 100644
--- a/src/plugins/media-export/rygel-media-export-database.vala
+++ b/src/plugins/media-export/rygel-media-export-database.vala
@@ -108,7 +108,7 @@ internal class Rygel.MediaExport.Database : Object {
"rygel");
DirUtils.create_with_parents (dirname, 0750);
var db_file = Path.build_filename (dirname, "%s.db".printf (name));
- debug (_("Using database file %s"), db_file);
+ debug ("Using database file %s", db_file);
var rc = Sqlite.Database.open (db_file, out this.db);
if (rc != Sqlite.OK) {
throw new DatabaseError.IO_ERROR (
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index 896d5ac..604ddd1 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -141,7 +141,7 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
case FileMonitorEvent.CHANGES_DONE_HINT:
if (this.file_filter == null ||
this.file_filter.match (file.get_uri ())) {
- debug (_("Trying to harvest %s because of %d"),
+ debug ("Trying to harvest %s because of %d",
file.get_uri (),
event);
var id = MediaCache.get_id (file.get_parent ());
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index 832de7d..d8e9dbf 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -251,8 +251,8 @@ public class Rygel.MediaExport.MediaCache : Object {
var filter = this.translate_search_expression (expression, args);
if (expression != null) {
- debug (_("Original search: %s"), expression.to_string ());
- debug (_("Parsed search expression: %s"), filter);
+ debug ("Original search: %s", expression.to_string ());
+ debug ("Parsed search expression: %s", filter);
}
for (int i = 0; i < args.n_values; i++) {
diff --git a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
index 48c9963..a5ea643 100644
--- a/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
+++ b/src/plugins/media-export/rygel-media-export-metadata-extractor.vala
@@ -108,7 +108,7 @@ public class Rygel.MediaExport.MetadataExtractor: GLib.Object {
this.extract_file_info (file, out mime, out size, out mtime);
this.extraction_done (file, dlna, mime, size, mtime);
} catch (Error e) {
- debug (_("Failed to extract metadata from %s: %s"),
+ debug ("Failed to extract metadata from %s: %s",
dlna.info.uri,
e.message);
}
diff --git a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
index 28ce20b..341d72d 100644
--- a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
+++ b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
@@ -45,7 +45,7 @@ public class Rygel.MediaExport.RecursiveFileMonitor : Object {
case FileMonitorEvent.DELETED:
var file_monitor = this.monitors.get (file);
if (file_monitor != null) {
- debug (_("Folder %s gone; removing watch"),
+ debug ("Folder %s gone; removing watch",
file.get_uri ());
this.monitors.unset (file);
file_monitor.cancel ();
diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index 27f437b..6e573c9 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -350,7 +350,7 @@ public class Rygel.MediaExport.RootContainer : Rygel.MediaExport.DBContainer {
}
foreach (var id in ids) {
- debug (_("ID %s no longer in config; deleting..."), id);
+ debug ("ID %s no longer in config; deleting...", id);
try {
this.media_db.remove_by_id (id);
} catch (DatabaseError error) {
diff --git a/src/plugins/mpris/rygel-mpris-player.vala b/src/plugins/mpris/rygel-mpris-player.vala
index 5033704..a55801e 100644
--- a/src/plugins/mpris/rygel-mpris-player.vala
+++ b/src/plugins/mpris/rygel-mpris-player.vala
@@ -38,7 +38,7 @@ public class Rygel.MPRIS.Player : GLib.Object, Rygel.MediaPlayer {
}
set {
- debug (_("Changing playback state to %s.."), value);
+ debug ("Changing playback state to %s..", value);
/* FIXME: Do something about errors below */
switch (value) {
diff --git a/src/plugins/playbin/rygel-playbin-player.vala b/src/plugins/playbin/rygel-playbin-player.vala
index 1fe406a..014f52d 100644
--- a/src/plugins/playbin/rygel-playbin-player.vala
+++ b/src/plugins/playbin/rygel-playbin-player.vala
@@ -63,7 +63,7 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
}
set {
- debug (_("Changing playback state to %s."), value);
+ debug ("Changing playback state to %s.", value);
this._playback_state = value;
switch (this._playback_state) {
@@ -89,7 +89,7 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
set {
this.playbin.uri = value;
- debug (_("URI set to %s."), value);
+ debug ("URI set to %s.", value);
}
}
@@ -100,7 +100,7 @@ public class Rygel.Playbin.Player : GLib.Object, Rygel.MediaPlayer {
set {
this.playbin.volume = value;
- debug (_("volume set to %f."), value);
+ debug ("volume set to %f.", value);
}
}
diff --git a/src/plugins/tracker/rygel-tracker-insertion-query.vala b/src/plugins/tracker/rygel-tracker-insertion-query.vala
index 1a68a57..888cd07 100644
--- a/src/plugins/tracker/rygel-tracker-insertion-query.vala
+++ b/src/plugins/tracker/rygel-tracker-insertion-query.vala
@@ -60,7 +60,7 @@ public class Rygel.Tracker.InsertionQuery : Query {
throws DBus.Error {
var str = this.to_string ();
- debug (_("Executing SPARQL query: %s"), str);
+ debug ("Executing SPARQL query: %s", str);
var result = yield resources.sparql_update_blank (str);
diff --git a/src/plugins/tracker/rygel-tracker-selection-query.vala b/src/plugins/tracker/rygel-tracker-selection-query.vala
index d27fcf8..c35fc4c 100644
--- a/src/plugins/tracker/rygel-tracker-selection-query.vala
+++ b/src/plugins/tracker/rygel-tracker-selection-query.vala
@@ -68,7 +68,7 @@ public class Rygel.Tracker.SelectionQuery : Query {
throws DBus.Error {
var str = this.to_string ();
- debug (_("Executing SPARQL query: %s"), str);
+ debug ("Executing SPARQL query: %s", str);
result = yield resources.sparql_query (str);
}
diff --git a/src/rygel/rygel-av-transport.vala b/src/rygel/rygel-av-transport.vala
index 45f54cd..944a491 100644
--- a/src/rygel/rygel-av-transport.vala
+++ b/src/rygel/rygel-av-transport.vala
@@ -411,7 +411,7 @@ internal class Rygel.AVTransport : Service {
switch (unit) {
case "ABS_TIME":
case "REL_TIME":
- debug (_("Seeking to %s."), target);
+ debug ("Seeking to %s.", target);
if (!this.player.seek (GstUtils.time_from_string (target))) {
action.return_error (710, _("Seek mode not supported"));
diff --git a/src/rygel/rygel-changelog.vala b/src/rygel/rygel-changelog.vala
index 2081086..602990e 100644
--- a/src/rygel/rygel-changelog.vala
+++ b/src/rygel/rygel-changelog.vala
@@ -65,7 +65,7 @@ internal class Rygel.ChangeLog : Object {
private void ensure_timeout () {
// Make sure we have a notification timeout
if (this.service != null && this.timeout_id == 0) {
- debug (_("Setting up timeout for LastChange"));
+ debug ("Setting up timeout for LastChange");
this.timeout_id = Timeout.add (200, this.timeout);
}
}
diff --git a/src/rygel/rygel-http-get.vala b/src/rygel/rygel-http-get.vala
index f5be2e0..b994c31 100644
--- a/src/rygel/rygel-http-get.vala
+++ b/src/rygel/rygel-http-get.vala
@@ -122,7 +122,7 @@ internal class Rygel.HTTPGet : HTTPRequest {
// Add headers
this.handler.add_response_headers (this);
- debug (_("Following HTTP headers appended to response:"));
+ debug ("Following HTTP headers appended to response:");
this.msg.response_headers.foreach ((name, value) => {
debug ("%s : %s", name, value);
});
diff --git a/src/rygel/rygel-http-server.vala b/src/rygel/rygel-http-server.vala
index 460a220..e5fcedd 100644
--- a/src/rygel/rygel-http-server.vala
+++ b/src/rygel/rygel-http-server.vala
@@ -134,7 +134,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
this.requests.remove (request);
- debug (_("HTTP %s request for URI '%s' handled."),
+ debug ("HTTP %s request for URI '%s' handled.",
request.msg.method,
request.msg.get_uri ().to_string (false));
}
@@ -149,7 +149,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
return;
}
- debug (_("HTTP %s request for URI '%s'. Headers:"),
+ debug ("HTTP %s request for URI '%s'. Headers:",
msg.method,
msg.get_uri ().to_string (false));
msg.request_headers.foreach ((name, value) => {
@@ -165,7 +165,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
foreach (var request in this.requests) {
if (request.msg == message) {
request.cancellable.cancel ();
- debug (_("HTTP client aborted %s request for URI '%s'."),
+ debug ("HTTP client aborted %s request for URI '%s'.",
request.msg.method,
request.msg.get_uri ().to_string (false));
@@ -183,7 +183,7 @@ internal class Rygel.HTTPServer : Rygel.TranscodeManager, Rygel.StateMachine {
private void on_got_headers (Soup.Message msg) {
if (msg.method == "POST" &&
msg.uri.path.has_prefix (this.path_root)) {
- debug (_("HTTP POST request for URI '%s'"),
+ debug ("HTTP POST request for URI '%s'",
msg.get_uri ().to_string (false));
this.queue_request (new HTTPPost (this, this.context.server, msg));
diff --git a/src/rygel/rygel-import-resource.vala b/src/rygel/rygel-import-resource.vala
index dcbb55c..9b5543e 100644
--- a/src/rygel/rygel-import-resource.vala
+++ b/src/rygel/rygel-import-resource.vala
@@ -131,7 +131,7 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
this.status = TransferStatus.COMPLETED;
- debug (_("Import of '%s' to '%s' completed"),
+ debug ("Import of '%s' to '%s' completed",
source_uri,
destination_uri);
} catch (Error err) {
diff --git a/src/rygel/rygel-main.vala b/src/rygel/rygel-main.vala
index d4c7b5a..8a983e7 100644
--- a/src/rygel/rygel-main.vala
+++ b/src/rygel/rygel-main.vala
@@ -120,7 +120,7 @@ public class Rygel.Main : Object {
GUPnP.Context context) {
string iface = null;
- debug (_("new network context %s (%s) available."),
+ debug ("new network context %s (%s) available.",
context.interface,
context.host_ip);
@@ -142,7 +142,7 @@ public class Rygel.Main : Object {
err.message);
}
} else {
- debug (_("Ignoring network context %s (%s)."),
+ debug ("Ignoring network context %s (%s).",
context.interface,
context.host_ip);
}
@@ -150,7 +150,7 @@ public class Rygel.Main : Object {
private void on_context_unavailable (GUPnP.ContextManager manager,
GUPnP.Context context) {
- debug (_("Network context %s (%s) now unavailable."),
+ debug ("Network context %s (%s) now unavailable.",
context.interface,
context.host_ip);
diff --git a/src/rygel/rygel-plugin-loader.vala b/src/rygel/rygel-plugin-loader.vala
index e968374..f1c1a4b 100644
--- a/src/rygel/rygel-plugin-loader.vala
+++ b/src/rygel/rygel-plugin-loader.vala
@@ -72,7 +72,7 @@ public class Rygel.PluginLoader : Object {
this.plugin_hash.set (plugin.name, plugin);
this.plugin_available (plugin);
} else {
- debug (_("Plugin '%s' disabled in user configuration; ignoring.."),
+ debug ("Plugin '%s' disabled in user configuration; ignoring..",
plugin.name);
}
}
@@ -86,7 +86,7 @@ public class Rygel.PluginLoader : Object {
}
private async void load_modules_from_dir (File dir) {
- debug (_("Searching for modules in folder '%s'."), dir.get_path ());
+ debug ("Searching for modules in folder '%s'.", dir.get_path ());
string attributes = FILE_ATTRIBUTE_STANDARD_NAME + "," +
FILE_ATTRIBUTE_STANDARD_TYPE + "," +
@@ -131,7 +131,7 @@ public class Rygel.PluginLoader : Object {
}
}
- debug (_("Finished searching for modules in folder '%s'"),
+ debug ("Finished searching for modules in folder '%s'",
dir.get_path ());
}
@@ -164,7 +164,7 @@ public class Rygel.PluginLoader : Object {
module_init (this);
- debug (_("Loaded module source: '%s'"), module.name());
+ debug ("Loaded module source: '%s'", module.name());
}
private static bool is_dir (File file) {
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index e69451e..2e43833 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -241,7 +241,7 @@ internal class Rygel.RootDeviceFactory {
var icons = plugin.icon_infos;
if (icons == null || icons.size == 0) {
- debug (_("No icon provided by plugin '%s'. Using Rygel logo."),
+ debug ("No icon provided by plugin '%s'. Using Rygel logo.",
plugin.name);
icons = plugin.default_icons;
diff --git a/src/rygel/rygel-search.vala b/src/rygel/rygel-search.vala
index 40b4187..05c418e 100644
--- a/src/rygel/rygel-search.vala
+++ b/src/rygel/rygel-search.vala
@@ -51,7 +51,7 @@ internal class Rygel.Search: Rygel.MediaQueryAction {
"No search criteria given");
}
- debug (_("Executing search request: %s"), this.search_criteria);
+ debug ("Executing search request: %s", this.search_criteria);
}
protected override async MediaObjects fetch_results (
diff --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index b4e55c0..c634701 100644
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -163,7 +163,7 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
out path,
KeyFileFlags.KEEP_COMMENTS |
KeyFileFlags.KEEP_TRANSLATIONS);
- debug (_("Loaded user configuration from file '%s'"), path);
+ debug ("Loaded user configuration from file '%s'", path);
try {
DBus.Connection connection = DBus.Bus.get (DBus.BusType.SESSION);
@@ -177,7 +177,7 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
DBUS_PATH,
DBUS_INTERFACE);
} catch (DBus.Error err) {
- debug (_("Failed to connect to session bus: %s"), err.message);
+ debug ("Failed to connect to session bus: %s", err.message);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
