diff options
| author | TingPing <tingping@tingping.se> | 2013-06-18 20:40:07 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2013-06-18 20:40:07 -0400 |
| commit | 64ba92593ec39de86c98b1b3b59154cbad60bc9a (patch) | |
| tree | 031723a25bb08b2090e79cd3179924bf2c66172b /src/common/url.h | |
| parent | 33b5dc1c75d5de83c7d49c090266c23961717088 (diff) | |
| parent | 02139fbb79e8a761ade80a6fffc03f072d97b3da (diff) | |
fix merge conflict
Diffstat (limited to 'src/common/url.h')
| -rw-r--r-- | src/common/url.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/url.h b/src/common/url.h index 96d9f946..2085c73e 100644 --- a/src/common/url.h +++ b/src/common/url.h @@ -26,7 +26,8 @@ extern void *url_tree; #define WORD_NICK 2 #define WORD_CHANNEL 3 #define WORD_HOST 4 -#define WORD_EMAIL 5 +#define WORD_HOST6 5 +#define WORD_EMAIL 6 /* anything >0 will be displayed as a link by gtk_xtext_motion_notify() */ #define WORD_DIALOG -1 #define WORD_PATH -2 |