Skip to content
Snippets Groups Projects
Unverified Commit c6e70793 authored by Maxim Cournoyer's avatar Maxim Cournoyer Committed by Maxim Cournoyer
Browse files

Replace dring mentions by jamid.

This follows the renaming of the 'dring' binary in the daemon to
'jamid'.

Change-Id: Ic434377ac91cba4b782b0245f7d504edb871fc4e
parent b18d4562
Branches
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ Bug report form ...@@ -7,7 +7,7 @@ Bug report form
## Jami daemon version: ## Jami daemon version:
<!-- type `/usr/lib/ring/dring -h` into your terminal --> <!-- type `/usr/libexec/jamid -h` into your terminal -->
## Jami GNOME client version: ## Jami GNOME client version:
...@@ -19,7 +19,7 @@ Bug report form ...@@ -19,7 +19,7 @@ Bug report form
- [x] My OS package manager (e.g. apt, yum, pacman) - [x] My OS package manager (e.g. apt, yum, pacman)
- [ ] I downloaded it from jami.net - [ ] I downloaded it from jami.net
- [ ] I built it from source using the make-ring.py script - [ ] I built it from source using the build.py script
- [ ] I built it from source manually or other (please explain): - [ ] I built it from source manually or other (please explain):
## Steps to reproduce bug ## Steps to reproduce bug
...@@ -42,7 +42,7 @@ Steps: ...@@ -42,7 +42,7 @@ Steps:
<!-- run <!-- run
journalctl --since "24h ago" | grep dring journalctl --since "24h ago" | grep jamid
in your terminal --> in your terminal -->
......
...@@ -19,6 +19,6 @@ Restores the hidden state of the main window. This is only applicable to the pri ...@@ -19,6 +19,6 @@ Restores the hidden state of the main window. This is only applicable to the pri
.B \-h, \-\-help .B \-h, \-\-help
Display help text and exit. Display help text and exit.
.SH SEE ALSO .SH SEE ALSO
dring(1) jamid(1)
.SH AUTHOR .SH AUTHOR
Alexandre Viau (alexandre.viau@savoirfairelinux.net) Alexandre Viau (alexandre.viau@savoirfairelinux.net)
...@@ -111,7 +111,7 @@ exception_dialog(const char* msg) ...@@ -111,7 +111,7 @@ exception_dialog(const char* msg)
GtkWidget *dialog = gtk_message_dialog_new(NULL, GtkWidget *dialog = gtk_message_dialog_new(NULL,
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
_("Unable to initialize.\nMake sure the Jami daemon (dring) is running.\nError: %s"), _("Unable to initialize.\nMake sure the Jami daemon (jamid) is running.\nError: %s"),
msg); msg);
gtk_window_set_title(GTK_WINDOW(dialog), _("Jami Error")); gtk_window_set_title(GTK_WINDOW(dialog), _("Jami Error"));
...@@ -505,7 +505,7 @@ client_startup(GApplication *app) ...@@ -505,7 +505,7 @@ client_startup(GApplication *app)
/* init libRingClient and make sure its connected to the dbus */ /* init libRingClient and make sure its connected to the dbus */
try { try {
priv->qtapp = new QCoreApplication(priv->argc, priv->argv); priv->qtapp = new QCoreApplication(priv->argc, priv->argv);
/* the call model will try to connect to dring via dbus */ /* the call model will try to connect to jamid via dbus */
} catch(const char * msg) { } catch(const char * msg) {
exception_dialog(msg); exception_dialog(msg);
exit(1); exit(1);
...@@ -580,7 +580,7 @@ client_shutdown(GApplication *app) ...@@ -580,7 +580,7 @@ client_shutdown(GApplication *app)
QObject::disconnect(priv->uam_updated); QObject::disconnect(priv->uam_updated);
/* free the QCoreApplication, which will destroy all libRingClient models /* free the QCoreApplication, which will destroy all libRingClient models
* and thus send the Unregister signal over dbus to dring */ * and thus send the Unregister signal over dbus to jamid */
if (priv->qtapp) { if (priv->qtapp) {
delete priv->qtapp; delete priv->qtapp;
priv->qtapp = nullptr; priv->qtapp = nullptr;
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
namespace Interfaces { namespace Interfaces {
static GtkWidget* static GtkWidget*
dring_crash_dialog() jamid_crash_dialog()
{ {
GtkWidget *dialog = gtk_dialog_new(); GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
...@@ -54,7 +54,7 @@ dring_crash_dialog() ...@@ -54,7 +54,7 @@ dring_crash_dialog()
gtk_widget_set_margin_top(content_area, 25); gtk_widget_set_margin_top(content_area, 25);
auto message = gtk_label_new( auto message = gtk_label_new(
_("Trying to reconnect to the Jami daemon (dring)…") _("Trying to reconnect to the Jami daemon (jamid)…")
); );
gtk_box_pack_start(GTK_BOX(content_area), message, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(content_area), message, FALSE, TRUE, 0);
...@@ -84,7 +84,7 @@ quitting_dialog() ...@@ -84,7 +84,7 @@ quitting_dialog()
win, win,
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
_("Could not re-connect to the Jami daemon (dring).\nJami will now quit.") _("Could not re-connect to the Jami daemon (jamid).\nJami will now quit.")
); );
if (win) { if (win) {
...@@ -132,9 +132,9 @@ check_connection_cb(GtkWidget *warning_dialog) ...@@ -132,9 +132,9 @@ check_connection_cb(GtkWidget *warning_dialog)
static gboolean static gboolean
error_cb(G_GNUC_UNUSED gpointer user_data) error_cb(G_GNUC_UNUSED gpointer user_data)
{ {
g_warning("dring has possibly crashed, or has been killed... will wait 2.5 seconds and try to reconnect"); g_warning("jamid has possibly crashed, or has been killed... will wait 2.5 seconds and try to reconnect");
auto warning_dialog = dring_crash_dialog(); auto warning_dialog = jamid_crash_dialog();
gtk_window_present(GTK_WINDOW(warning_dialog)); gtk_window_present(GTK_WINDOW(warning_dialog));
/* allow 2.5 seconds for the daemon to restart and then see if we're re-connected */ /* allow 2.5 seconds for the daemon to restart and then see if we're re-connected */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment