deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-14 01:30:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
TingPing
2013-06-18 20:40:07 -04:00
parent 33b5dc1c75 02139fbb79
commit 64ba92593e
4 changed files with 181 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/fe-gtk/fe-gtk.c
View File

@@ -1008,11 +1008,13 @@ fe_open_url_inner (const char *url)
static void
fe_open_url_locale (const char *url)
{
if (url_check_word (url) == WORD_PATH)
int url_type = url_check_word (url);
char *uri;
/* gvfs likes file:// */
if (url_type == WORD_PATH)
{
#ifndef WIN32
char *uri;
uri = g_strconcat ("file://", url, NULL);
fe_open_url_inner (uri);
g_free (uri);
@@ -1020,6 +1022,18 @@ fe_open_url_locale (const char *url)
fe_open_url_inner (url);
#endif
}
/* IPv6 addr. Add http:// */
else if (url_type == WORD_HOST6)
{
/* IPv6 addrs in urls should be enclosed in [ ] */
if (*url != '[')
uri = g_strdup_printf ("http://[%s]", url);
else
uri = g_strdup_printf ("http://%s", url);
fe_open_url_inner (uri);
g_free (uri);
}
/* the http:// part's missing, prepend it, otherwise it won't always work */
else if (strchr (url, ':') == NULL)
{

2
src/fe-gtk/maingui.c
View File

@@ -2267,6 +2267,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
switch (word_type)
{
case WORD_URL:
case WORD_HOST6:
case WORD_HOST:
word[end] = 0;
fe_open_url (word + start);
@@ -2293,6 +2294,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
menu_middlemenu (sess, even);
break;
case WORD_URL:
case WORD_HOST6:
case WORD_HOST:
word[end] = 0;
word += start;