This commit also changes the licence of the moved code from GPL to LGPL.
See GOSSIP-RELICENSING.txt for details.
https://bugzilla.gnome.org/show_bug.cgi?id=699492
#include <glib/gi18n-lib.h>
#include <gio/gdesktopappinfo.h>
#include <tp-account-widgets/tpaw-live-search.h>
+#include <tp-account-widgets/tpaw-utils.h>
#include "empathy-ft-factory.h"
#include "empathy-images.h"
return ret;
}
-/** empathy_make_absolute_url_len:
- * @url: an url
- * @len: a length
- *
- * Same as #empathy_make_absolute_url but for a limited string length
- */
-gchar *
-empathy_make_absolute_url_len (const gchar *url,
- guint len)
-{
- g_return_val_if_fail (url != NULL, NULL);
-
- if (g_str_has_prefix (url, "help:") ||
- g_str_has_prefix (url, "mailto:") ||
- strstr (url, ":/"))
- return g_strndup (url, len);
-
- if (strstr (url, "@"))
- return g_strdup_printf ("mailto:%.*s", len, url);
-
- return g_strdup_printf ("http://%.*s", len, url);
-}
-
-/** empathy_make_absolute_url:
- * @url: an url
- *
- * The URL opening code can't handle schemeless strings, so we try to be
- * smart and add http if there is no scheme or doesn't look like a mail
- * address. This should work in most cases, and let us click on strings
- * like "www.gnome.org".
- *
- * Returns: a newly allocated url with proper mailto: or http:// prefix, use
- * g_free when your are done with it
- */
-gchar *
-empathy_make_absolute_url (const gchar *url)
-{
- return empathy_make_absolute_url_len (url, strlen (url));
-}
-
void
empathy_url_show (GtkWidget *parent,
const char *url)
g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
g_return_if_fail (url != NULL);
- real_url = empathy_make_absolute_url (url);
+ real_url = tpaw_make_absolute_url (url);
gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, real_url,
gtk_get_current_event_time (), &error);
guint32 timestamp);
/* URL */
-gchar * empathy_make_absolute_url (const gchar *url);
-
-gchar * empathy_make_absolute_url_len (const gchar *url,
- guint len);
void empathy_url_show (GtkWidget *parent,
const char *url);
#include "config.h"
#include "tpaw-string-parser.h"
+#include <tp-account-widgets/tpaw-utils.h>
+
#include "empathy-ui-utils.h"
#define SCHEMES "([a-zA-Z\\+]+)"
gchar *title;
gchar *markup;
- real_url = empathy_make_absolute_url_len (text, len);
+ real_url = tpaw_make_absolute_url_len (text, len);
/* Need to copy manually, because g_markup_printf_escaped does not work
* with string precision pitfalls. */
return NULL;
}
+
+/** tpaw_make_absolute_url_len:
+ * @url: an url
+ * @len: a length
+ *
+ * Same as #tpaw_make_absolute_url but for a limited string length
+ */
+gchar *
+tpaw_make_absolute_url_len (const gchar *url,
+ guint len)
+{
+ g_return_val_if_fail (url != NULL, NULL);
+
+ if (g_str_has_prefix (url, "help:") ||
+ g_str_has_prefix (url, "mailto:") ||
+ strstr (url, ":/"))
+ return g_strndup (url, len);
+
+ if (strstr (url, "@"))
+ return g_strdup_printf ("mailto:%.*s", len, url);
+
+ return g_strdup_printf ("http://%.*s", len, url);
+}
+
+/** tpaw_make_absolute_url:
+ * @url: an url
+ *
+ * The URL opening code can't handle schemeless strings, so we try to be
+ * smart and add http if there is no scheme or doesn't look like a mail
+ * address. This should work in most cases, and let us click on strings
+ * like "www.gnome.org".
+ *
+ * Returns: a newly allocated url with proper mailto: or http:// prefix, use
+ * g_free when your are done with it
+ */
+gchar *
+tpaw_make_absolute_url (const gchar *url)
+{
+ return tpaw_make_absolute_url_len (url, strlen (url));
+}
guint32 timestamp);
GtkWindow * tpaw_get_toplevel_window (GtkWidget *widget);
+/* URL */
+gchar * tpaw_make_absolute_url (const gchar *url);
+gchar * tpaw_make_absolute_url_len (const gchar *url,
+ guint len);
+
/* Copied from wocky/wocky-utils.h */
#define tpaw_implement_finish_void(source, tag) \