diff --git a/src/blankWindow/blankWindow.vala b/src/blankWindow/blankWindow.vala index 5c1701b5..720b9c60 100644 --- a/src/blankWindow/blankWindow.vala +++ b/src/blankWindow/blankWindow.vala @@ -30,7 +30,7 @@ namespace SwayNotificationCenter { try { swaync_daemon.set_visibility (false); } catch (Error e) { - stderr.printf ("ControlCenter BlankWindow Click Error: %s\n", + warning ("ControlCenter BlankWindow Click Error: %s", e.message); } } @@ -60,10 +60,10 @@ namespace SwayNotificationCenter { }); if (!GtkLayerShell.is_supported ()) { - stderr.printf ("GTKLAYERSHELL IS NOT SUPPORTED!\n"); - stderr.printf ("Swaync only works on Wayland!\n"); - stderr.printf ("If running waylans session, try running:\n"); - stderr.printf ("\tGDK_BACKEND=wayland swaync\n"); + critical ("GTKLAYERSHELL IS NOT SUPPORTED!"); + critical ("Swaync only works on Wayland!"); + critical ("If running Wayland session, try running:"); + critical ("\tGDK_BACKEND=wayland swaync"); Process.exit (1); } GtkLayerShell.init_for_window (this); diff --git a/src/client.vala b/src/client.vala index 29b02897..1b7f8c70 100644 --- a/src/client.vala +++ b/src/client.vala @@ -227,7 +227,7 @@ public int command_line (ref string[] args, bool skip_wait) { case "--inhibitor-add": case "-Ia": if (args.length < 2) { - stderr.printf ("Application ID needed!"); + printerr ("Application ID needed!"); Process.exit (1); } used_args++; @@ -235,12 +235,12 @@ public int command_line (ref string[] args, bool skip_wait) { print ("Added inhibitor: \"%s\"", args[1]); break; } - stderr.printf ("Inhibitor: \"%s\" already added!...", args[1]); + printerr ("Inhibitor: \"%s\" already added!...", args[1]); break; case "--inhibitor-remove": case "-Ir": if (args.length < 2) { - stderr.printf ("Application ID needed!"); + printerr ("Application ID needed!"); Process.exit (1); } used_args++; @@ -248,7 +248,7 @@ public int command_line (ref string[] args, bool skip_wait) { print ("Removed inhibitor: \"%s\"", args[1]); break; } - stderr.printf ("Inhibitor: \"%s\" does not exist!...", args[1]); + printerr ("Inhibitor: \"%s\" does not exist!...", args[1]); break; case "inhibitors-clear": case "-Ic": @@ -289,7 +289,7 @@ public int command_line (ref string[] args, bool skip_wait) { break; case "--change-cc-monitor": if (args.length < 2) { - stderr.printf ("Monitor connector name needed!"); + printerr ("Monitor connector name needed!"); Process.exit (1); } used_args++; @@ -297,11 +297,11 @@ public int command_line (ref string[] args, bool skip_wait) { print ("Changed monitor to: \"%s\"", args[1]); break; } - stderr.printf ("Could not find monitor: \"%s\"!", args[1]); + printerr ("Could not find monitor: \"%s\"!", args[1]); break; case "--change-noti-monitor": if (args.length < 2) { - stderr.printf ("Monitor connector name needed!"); + printerr ("Monitor connector name needed!"); Process.exit (1); } used_args++; @@ -309,7 +309,7 @@ public int command_line (ref string[] args, bool skip_wait) { print ("Changed monitor to: \"%s\"", args[1]); break; } - stderr.printf ("Could not find monitor: \"%s\"!", args[1]); + printerr ("Could not find monitor: \"%s\"!", args[1]); break; default: printerr ("Unknown command: \"%s\"\n", args[0]); @@ -317,7 +317,7 @@ public int command_line (ref string[] args, bool skip_wait) { break; } } catch (Error e) { - stderr.printf (e.message + "\n"); + printerr (e.message + "\n"); if (skip_wait) { Process.exit (1); } @@ -329,7 +329,7 @@ public int command_line (ref string[] args, bool skip_wait) { } void print_connection_error () { - stderr.printf ( + printerr ( "Could not connect to CC service. Will wait for connection...\n"); } @@ -359,7 +359,7 @@ int try_connect (owned string[] args) { } // Should only be reached if the args only contains --skip-wait or -sw if (one_arg) { - stderr.printf ("Skipping wait, but with no action."); + printerr ("Skipping wait, but with no action."); } return 0; } catch (Error e) { diff --git a/src/configModel/configModel.vala b/src/configModel/configModel.vala index 5334eec8..932f8c65 100644 --- a/src/configModel/configModel.vala +++ b/src/configModel/configModel.vala @@ -1062,8 +1062,7 @@ namespace SwayNotificationCenter { var tmp_table = new OrderedHashTable (); if (node.get_node_type () != Json.NodeType.OBJECT) { - stderr.printf ("Node %s is not a json object!...\n", - property_name); + warning ("Node %s is not a json object!", property_name); return tmp_table; } @@ -1222,8 +1221,7 @@ namespace SwayNotificationCenter { GenericArray tmp_array = new GenericArray (); if (node.get_node_type () != Json.NodeType.ARRAY) { - stderr.printf ("Node %s is not a json array!...\n", - property_name); + warning ("Node %s is not a json array!", property_name); return tmp_array; } @@ -1397,7 +1395,7 @@ namespace SwayNotificationCenter { FileCreateFlags.REPLACE_DESTINATION, null); } catch (Error e) { - stderr.printf (e.message + "\n"); + warning ("%s", e.message); return false; } } diff --git a/src/controlCenter/controlCenter.vala b/src/controlCenter/controlCenter.vala index 7c2480e0..b42daa30 100644 --- a/src/controlCenter/controlCenter.vala +++ b/src/controlCenter/controlCenter.vala @@ -26,10 +26,10 @@ namespace SwayNotificationCenter { if (app.use_layer_shell) { if (!GtkLayerShell.is_supported ()) { - stderr.printf ("GTKLAYERSHELL IS NOT SUPPORTED!\n"); - stderr.printf ("Swaync only works on Wayland!\n"); - stderr.printf ("If running wayland session, try running:\n"); - stderr.printf ("\tGDK_BACKEND=wayland swaync\n"); + critical ("GTKLAYERSHELL IS NOT SUPPORTED!"); + critical ("Swaync only works on Wayland!"); + critical ("If running wayland session, try running:"); + critical ("\tGDK_BACKEND=wayland swaync"); Process.exit (1); } GtkLayerShell.init_for_window (this); diff --git a/src/controlCenter/widgets/shared/toggleButton.vala b/src/controlCenter/widgets/shared/toggleButton.vala index 93b176b5..f525f7e5 100644 --- a/src/controlCenter/widgets/shared/toggleButton.vala +++ b/src/controlCenter/widgets/shared/toggleButton.vala @@ -44,7 +44,7 @@ namespace SwayNotificationCenter.Widgets { } GLib.SignalHandler.unblock (this, this.handler_id); } catch (RegexError e) { - stderr.printf ("RegexError: %s\n", e.message); + warning ("RegexError: %s", e.message); } } } diff --git a/src/controlCenter/widgets/volume/pulseDaemon.vala b/src/controlCenter/widgets/volume/pulseDaemon.vala index d8574ff9..8bf7bf5b 100644 --- a/src/controlCenter/widgets/volume/pulseDaemon.vala +++ b/src/controlCenter/widgets/volume/pulseDaemon.vala @@ -60,7 +60,7 @@ namespace SwayNotificationCenter.Widgets { private void get_context () { var ctx = new Context (mainloop.get_api (), null); ctx.set_state_callback ((ctx) => { - debug ("Pulse Status: %s\n", ctx.get_state ().to_string ()); + debug ("Pulse Status: %s", ctx.get_state ().to_string ()); switch (ctx.get_state ()) { case Context.State.CONNECTING : case Context.State.AUTHORIZING : @@ -83,20 +83,20 @@ namespace SwayNotificationCenter.Widgets { quitting = false; break; } - stderr.printf ( - "PulseAudio connection lost. Will retry connection.\n"); + warning ( + "PulseAudio connection lost. Will retry connection."); get_context (); break; default: running = false; - stderr.printf ("Connection failure: %s\n", + warning ("Connection failure: %s", PulseAudio.strerror (ctx.errno ())); break; } }); if (ctx.connect ( null, Context.Flags.NOFAIL, null) < 0) { - stdout.printf ("pa_context_connect() failed: %s\n", + stdout.printf ("pa_context_connect() failed: %s", PulseAudio.strerror (ctx.errno ())); } this.context = ctx; @@ -589,7 +589,7 @@ namespace SwayNotificationCenter.Widgets { if (success == 1) { set_bluetooth_card_profile.callback (); } else { - stderr.printf ("setting the card %s profile to %s failed\n", + warning ("setting the card %s profile to %s failed", device.card_name, profile.name); } }); @@ -606,7 +606,7 @@ namespace SwayNotificationCenter.Widgets { if (success == 1) { set_card_profile_by_index.callback (); } else { - stderr.printf ("setting the card %s profile to %s failed\n", + warning ("setting the card %s profile to %s failed", device.card_name, profile_name); } }); @@ -620,7 +620,7 @@ namespace SwayNotificationCenter.Widgets { if (success == 1) { set_sink_port_by_name.callback (); } else { - stderr.printf ("setting sink port to %s failed\n", + warning ("setting sink port to %s failed", device.port_name); } }); @@ -632,7 +632,7 @@ namespace SwayNotificationCenter.Widgets { if (success == 1) { set_default_sink.callback (); } else { - stderr.printf ("setting default sink to %s failed\n", + warning ("setting default sink to %s failed", device.device_name); } }); diff --git a/src/functions.vala b/src/functions.vala index ec554534..73c58c6d 100644 --- a/src/functions.vala +++ b/src/functions.vala @@ -52,7 +52,7 @@ namespace SwayNotificationCenter { Gdk.Texture texture = Gdk.Texture.for_pixbuf (pixbuf); img.set_from_paintable (texture); } catch (Error e) { - stderr.printf (e.message + "\n"); + warning ("%s", e.message); } } @@ -158,8 +158,8 @@ namespace SwayNotificationCenter { } } if (path == "") { - stderr.printf ( - "COULD NOT FIND CSS FILE! REINSTALL THE PACKAGE!\n"); + critical ( + "COULD NOT FIND CSS FILE! REINSTALL THE PACKAGE!"); Process.exit (1); } return path; @@ -200,8 +200,8 @@ namespace SwayNotificationCenter { } } if (path == "") { - stderr.printf ( - "COULD NOT FIND CONFIG FILE! REINSTALL THE PACKAGE!\n"); + critical ( + "COULD NOT FIND CONFIG FILE! REINSTALL THE PACKAGE!"); Process.exit (1); } return path; diff --git a/src/main.vala b/src/main.vala index 3d1ebfe7..5a9f7dce 100644 --- a/src/main.vala +++ b/src/main.vala @@ -117,10 +117,10 @@ namespace SwayNotificationCenter { } }, () => { - stderr.printf ( + critical ( "Could not acquire notification name. " + "Please close any other notification daemon " + - "like mako or dunst\n"); + "like mako or dunst"); Process.exit (1); }); yield; diff --git a/src/notiDaemon/notiDaemon.vala b/src/notiDaemon/notiDaemon.vala index 1fe4ee7d..77163eec 100644 --- a/src/notiDaemon/notiDaemon.vala +++ b/src/notiDaemon/notiDaemon.vala @@ -336,8 +336,8 @@ namespace SwayNotificationCenter { } if (!ConfigModel.instance.script_fail_notify) { - stderr.printf ( - "Failed to run script: \"%s\" with exec: \"%s\"\n", + warning ( + "Failed to run script: \"%s\" with exec: \"%s\"", key, script.exec); } else { // Send notification with error message @@ -361,8 +361,8 @@ namespace SwayNotificationCenter { _hints, -1); } catch (Error e) { - stderr.printf ("NOTIFING SCRIPT-FAIL ERROR: %s\n", - e.message); + critical ("Notifying script-fail error: %s", + e.message); } } }); diff --git a/src/notification/notification.vala b/src/notification/notification.vala index 3d2bfa3e..4417efe7 100644 --- a/src/notification/notification.vala +++ b/src/notification/notification.vala @@ -140,8 +140,7 @@ namespace SwayNotificationCenter { tag_unescape_regex = new Regex ("&(?=%s)".printf (unescaped)); img_tag_regex = new Regex ("]* src=((\"([^\"]*)\")|(\'([^\']*)\'))[^>]*>"); } catch (Error e) { - stderr.printf ("Invalid regex: %s", e.message); - } + warning ("Invalid regex: %s", e.message); } bind_property ("dismissed", this, "sensitive", @@ -358,7 +357,7 @@ namespace SwayNotificationCenter { } } } catch (Error e) { - stderr.printf (e.message); + warning ("%s", e.message); } } @@ -393,7 +392,7 @@ namespace SwayNotificationCenter { this.body.set_attributes (attr); } } catch (Error e) { - stderr.printf ("Could not parse Pango markup %s: %s\n", + warning ("Could not parse Pango markup %s: %s", text, e.message); // Sets the original text this.body.set_text (text); diff --git a/src/notificationWindow/notificationWindow.vala b/src/notificationWindow/notificationWindow.vala index 16ad4065..27193e60 100644 --- a/src/notificationWindow/notificationWindow.vala +++ b/src/notificationWindow/notificationWindow.vala @@ -18,10 +18,10 @@ namespace SwayNotificationCenter { Object (css_name: "notificationwindow"); if (app.use_layer_shell) { if (!GtkLayerShell.is_supported ()) { - stderr.printf ("GTKLAYERSHELL IS NOT SUPPORTED!\n"); - stderr.printf ("Swaync only works on Wayland!\n"); - stderr.printf ("If running waylans session, try running:\n"); - stderr.printf ("\tGDK_BACKEND=wayland swaync\n"); + critical ("GTKLAYERSHELL IS NOT SUPPORTED!"); + critical ("Swaync only works on Wayland!"); + critical ("If running waylans session, try running:"); + critical ("\tGDK_BACKEND=wayland swaync"); Process.exit (1); } GtkLayerShell.init_for_window (this); diff --git a/src/swayncDaemon/swayncDaemon.vala b/src/swayncDaemon/swayncDaemon.vala index db497703..2a02173c 100644 --- a/src/swayncDaemon/swayncDaemon.vala +++ b/src/swayncDaemon/swayncDaemon.vala @@ -26,7 +26,7 @@ namespace SwayNotificationCenter { get_visibility (), inhibited); } catch (Error e) { - stderr.printf (e.message + "\n"); + warning ("%s", e.message); } }