[ekiga] Rename gm_open_uri to gm_platform_open_uri so the code is easier to find
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Rename gm_open_uri to gm_platform_open_uri so the code is easier to find
- Date: Sun, 13 Jan 2013 22:19:10 +0000 (UTC)
commit b60eabdcffc4a89076120c663c16f732574083e4
Author: Julien Puydt <jpuydt free fr>
Date: Sun Jan 13 23:18:14 2013 +0100
Rename gm_open_uri to gm_platform_open_uri so the code is easier to find
lib/engine/components/opal/opal-account.cpp | 2 +-
lib/engine/gui/gtk-core/form-dialog-gtk.cpp | 2 +-
lib/engine/gui/gtk-frontend/chat-area.cpp | 4 ++--
lib/platform/platform.c | 8 ++++----
lib/platform/platform.h | 2 +-
src/gui/assistant.cpp | 10 +++++-----
6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index cc28c71..9747c35 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -550,7 +550,7 @@ void Opal::Account::on_edit_form_submitted (bool submitted,
void
Opal::Account::on_consult (const std::string url)
{
- gm_open_uri (url.c_str ());
+ gm_platform_open_uri (url.c_str ());
}
diff --git a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
index bb5082b..849a15b 100644
--- a/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
+++ b/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
@@ -621,7 +621,7 @@ static void
link_clicked_cb (GtkWidget * /*widget*/,
gpointer data)
{
- gm_open_uri ((gchar *) data);
+ gm_platform_open_uri ((gchar *) data);
}
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index 930d210..75bb9a8 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -312,7 +312,7 @@ on_open_link_activate (G_GNUC_UNUSED GtkMenuItem* item,
link = (gchar*)g_object_get_data (G_OBJECT (data), "link");
- gm_open_uri (link);
+ gm_platform_open_uri (link);
}
static void
@@ -355,7 +355,7 @@ on_extlink_tag_event (GtkTextTag* tag,
case 1:
- gm_open_uri (link);
+ gm_platform_open_uri (link);
break;
case 3: {
diff --git a/lib/platform/platform.c b/lib/platform/platform.c
index 5a47208..81df102 100644
--- a/lib/platform/platform.c
+++ b/lib/platform/platform.c
@@ -89,7 +89,7 @@ win32_datadir ()
#ifndef WIN32
static void
-gm_open_uri_fallback (const gchar *uri)
+gm_platform_open_uri_fallback (const gchar *uri)
{
gchar *commandline = NULL;
gboolean success = FALSE;
@@ -124,7 +124,7 @@ gm_open_uri_fallback (const gchar *uri)
}
void
-gm_open_uri (const gchar *uri)
+gm_platform_open_uri (const gchar *uri)
{
GError *error = NULL;
@@ -132,14 +132,14 @@ gm_open_uri (const gchar *uri)
if (!gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, &error)) {
g_error_free (error);
- gm_open_uri_fallback (uri);
+ gm_platform_open_uri_fallback (uri);
}
}
#else
void
-gm_open_uri (const gchar *uri)
+gm_platform_open_uri (const gchar *uri)
{
SHELLEXECUTEINFO sinfo;
diff --git a/lib/platform/platform.h b/lib/platform/platform.h
index 46605dd..9d16725 100644
--- a/lib/platform/platform.h
+++ b/lib/platform/platform.h
@@ -51,7 +51,7 @@ void gm_platform_shutdown ();
* in a system-agnostic way
* PRE : Requires a non-NULL uri.
*/
-void gm_open_uri (const gchar* uri);
+void gm_platform_open_uri (const gchar* uri);
G_END_DECLS
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index 5d15a45..7c7b6d2 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -460,7 +460,7 @@ static void
ekiga_net_button_clicked_cb (G_GNUC_UNUSED GtkWidget *button,
G_GNUC_UNUSED gpointer data)
{
- gm_open_uri ("http://www.ekiga.net");
+ gm_platform_open_uri ("http://www.ekiga.net");
}
@@ -481,7 +481,7 @@ ekiga_out_new_clicked_cb (G_GNUC_UNUSED GtkWidget *widget,
if (account == NULL || password == NULL)
return; /* no account configured yet */
- gm_open_uri ("https://www.diamondcard.us/exec/voip-login?act=sgn&spo=ekiga");
+ gm_platform_open_uri ("https://www.diamondcard.us/exec/voip-login?act=sgn&spo=ekiga");
}
@@ -505,7 +505,7 @@ ekiga_out_recharge_clicked_cb (G_GNUC_UNUSED GtkWidget *widget,
return; /* no account configured yet */
url = g_strdup_printf ("https://www.diamondcard.us/exec/voip-login?accId=%s&pinCode=%s&act=rch&spo=ekiga", account, password);
- gm_open_uri (url);
+ gm_platform_open_uri (url);
g_free (url);
}
@@ -530,7 +530,7 @@ ekiga_out_history_balance_clicked_cb (G_GNUC_UNUSED GtkWidget *widget,
return; /* no account configured yet */
url = g_strdup_printf ("https://www.diamondcard.us/exec/voip-login?accId=%s&pinCode=%s&act=bh&spo=ekiga", account, password);
- gm_open_uri (url);
+ gm_platform_open_uri (url);
g_free (url);
}
@@ -555,7 +555,7 @@ ekiga_out_history_calls_clicked_cb (G_GNUC_UNUSED GtkWidget *widget,
return; /* no account configured yet */
url = g_strdup_printf ("https://www.diamondcard.us/exec/voip-login?accId=%s&pinCode=%s&act=ch&spo=ekiga", account, password);
- gm_open_uri (url);
+ gm_platform_open_uri (url);
g_free (url);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]