diff options
Diffstat (limited to 'src/fe-gtk')
-rw-r--r-- | src/fe-gtk/chanlist.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/chanview-tree.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/chanview.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/editlist.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/fe-gtk.c | 8 | ||||
-rw-r--r-- | src/fe-gtk/fkeys.c | 18 | ||||
-rw-r--r-- | src/fe-gtk/gtkutil.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/maingui.c | 22 | ||||
-rw-r--r-- | src/fe-gtk/menu.c | 8 | ||||
-rw-r--r-- | src/fe-gtk/palette.c | 8 | ||||
-rw-r--r-- | src/fe-gtk/plugin-tray.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/rawlog.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/servlistgui.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/setup.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/sexy-spell-entry.c | 2 | ||||
-rw-r--r-- | src/fe-gtk/userlistgui.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/xtext.c | 14 |
17 files changed, 54 insertions, 54 deletions
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 8a431ebc..5b9064cf 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -494,7 +494,7 @@ chanlist_filereq_done (server *serv, char *file) if (!file) return; - fh = xchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600, + fh = hexchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE | XOF_FULLPATH); if (fh == -1) return; diff --git a/src/fe-gtk/chanview-tree.c b/src/fe-gtk/chanview-tree.c index bceabc8f..9fa58393 100644 --- a/src/fe-gtk/chanview-tree.c +++ b/src/fe-gtk/chanview-tree.c @@ -77,11 +77,11 @@ cv_tree_init (chanview *cv) GtkCellRenderer *renderer; static const GtkTargetEntry dnd_src_target[] = { - {"XCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 } + {"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 } }; static const GtkTargetEntry dnd_dest_target[] = { - {"XCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } + {"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } }; win = gtk_scrolled_window_new (0, 0); diff --git a/src/fe-gtk/chanview.c b/src/fe-gtk/chanview.c index e90c4df8..f7e01695 100644 --- a/src/fe-gtk/chanview.c +++ b/src/fe-gtk/chanview.c @@ -583,9 +583,9 @@ chan_remove (chan *ch, gboolean force) { chan *new_ch; int i, num; - extern int xchat_is_quitting; + extern int hexchat_is_quitting; - if (xchat_is_quitting) /* avoid lots of looping on exit */ + if (hexchat_is_quitting) /* avoid lots of looping on exit */ return TRUE; /* is this ch allowed to be closed while still having children? */ diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c index 2ce48ee4..af241e04 100644 --- a/src/fe-gtk/editlist.c +++ b/src/fe-gtk/editlist.c @@ -170,7 +170,7 @@ editlist_gui_save (GtkWidget * igad) char buf[512]; char *a, *b; - fh = xchat_open_file (editlist_file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE); + fh = hexchat_open_file (editlist_file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE); if (fh != -1) { while (1) diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 533d5bca..8d6577a6 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -137,7 +137,7 @@ static const GOptionEntry gopt_entries[] = {"url", 0, 0, G_OPTION_ARG_STRING, &arg_url, N_("Open an irc://server:port/channel URL"), "URL"}, #ifndef WIN32 /* uses DBUS */ {"command", 'c', 0, G_OPTION_ARG_STRING, &arg_command, N_("Execute command:"), "COMMAND"}, - {"existing", 'e', 0, G_OPTION_ARG_NONE, &arg_existing, N_("Open URL or execute command in an existing XChat"), NULL}, + {"existing", 'e', 0, G_OPTION_ARG_NONE, &arg_existing, N_("Open URL or execute command in an existing HexChat"), NULL}, #endif {"minimize", 0, 0, G_OPTION_ARG_INT, &arg_minimize, N_("Begin minimized. Level 0=Normal 1=Iconified 2=Tray"), N_("level")}, {"version", 'v', 0, G_OPTION_ARG_NONE, &arg_show_version, N_("Show version information"), NULL}, @@ -434,7 +434,7 @@ log_handler (const gchar *log_domain, { session *sess; - /* if (getenv ("XCHAT_WARNING_IGNORE")) this gets ignored sometimes, so simply just disable all warnings */ + /* if (getenv ("HEXCHAT_WARNING_IGNORE")) this gets ignored sometimes, so simply just disable all warnings */ return; sess = find_dialog (serv_list->data, "(warnings)"); @@ -442,7 +442,7 @@ log_handler (const gchar *log_domain, sess = new_ircwindow (serv_list->data, "(warnings)", SESS_DIALOG, 0); PrintTextf (sess, "%s\t%s\n", log_domain, message); - if (getenv ("XCHAT_WARNING_ABORT")) + if (getenv ("HEXCHAT_WARNING_ABORT")) abort (); } @@ -1055,7 +1055,7 @@ try_browser (const char *browser, const char *arg, const char *url) argv[2] = url; argv[3] = NULL; } - xchat_execv (argv); + hexchat_execv (argv); g_free (path); return 1; } diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index eee48b8d..d47d694b 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -427,7 +427,7 @@ key_load_defaults () "None\nF9\nRun Command\nD1:/GUI MENU TOGGLE\nD2!\n\n" int fd; - fd = xchat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY, 0x180, XOF_DOMODE); + fd = hexchat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY, 0x180, XOF_DOMODE); if (fd < 0) /* ???!!! */ return; @@ -502,7 +502,7 @@ key_dialog_delete (GtkWidget * button, GtkCList * list) cur = cur->next; } printf ("*** key_dialog_delete: couldn't find kb in list!\n"); - /*if (getenv ("XCHAT_DEBUG")) + /*if (getenv ("HEXCHAT_DEBUG")) abort ();*/ } } @@ -844,10 +844,10 @@ key_save_kbs (char *fn) struct key_binding *kb; if (!fn) - fd = xchat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY, + fd = hexchat_open_file ("keybindings.conf", O_CREAT | O_TRUNC | O_WRONLY, 0x180, XOF_DOMODE); else - fd = xchat_open_file (fn, O_CREAT | O_TRUNC | O_WRONLY, + fd = hexchat_open_file (fn, O_CREAT | O_TRUNC | O_WRONLY, 0x180, XOF_DOMODE | XOF_FULLPATH); if (fd < 0) { @@ -855,7 +855,7 @@ key_save_kbs (char *fn) return; } write (fd, buf, - snprintf (buf, 510, "# XChat key bindings config file\n\n")); + snprintf (buf, 510, "# HexChat key bindings config file\n\n")); kb = keys_root; i = 0; @@ -909,7 +909,7 @@ key_save_kbs (char *fn) } /* I just know this is going to be a nasty parse, if you think it's bugged - it almost certainly is so contact the XChat dev team --AGL */ + it almost certainly is so contact the HexChat dev team --AGL */ static inline int key_load_kbs_helper_mod (char *in, int *out) @@ -972,9 +972,9 @@ key_load_kbs (char *filename) int fd, len, pnt = 0, state = 0, n; if (filename == NULL) - fd = xchat_open_file ("keybindings.conf", O_RDONLY, 0, 0); + fd = hexchat_open_file ("keybindings.conf", O_RDONLY, 0, 0); else - fd = xchat_open_file (filename, O_RDONLY, 0, XOF_FULLPATH); + fd = hexchat_open_file (filename, O_RDONLY, 0, XOF_FULLPATH); if (fd < 0) return 1; if (fstat (fd, &st) != 0) @@ -1143,7 +1143,7 @@ key_load_kbs (char *filename) return 0; corrupt_file: - /*if (getenv ("XCHAT_DEBUG")) + /*if (getenv ("HEXCHAT_DEBUG")) abort ();*/ snprintf (ibuf, 1024, _("Key bindings config file is corrupt, load aborted\n" diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c index 8de4325d..adaa48db 100644 --- a/src/fe-gtk/gtkutil.c +++ b/src/fe-gtk/gtkutil.c @@ -123,7 +123,7 @@ gtkutil_check_file (char *file, struct file_req *freq) char *utf8_file; /* convert to UTF8. It might be converted back to locale by server.c's g_convert */ - utf8_file = xchat_filename_to_utf8 (file, -1, NULL, NULL, NULL); + utf8_file = hexchat_filename_to_utf8 (file, -1, NULL, NULL, NULL); if (utf8_file) { freq->callback (freq->userdata, utf8_file); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index f79c4ff8..9ae3a47f 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -1064,7 +1064,7 @@ mg_topdestroy_cb (GtkWidget *win, session *sess) /* kill the user list */ g_object_unref (G_OBJECT (sess->res->user_model)); - session_free (sess); /* tell xchat.c about it */ + session_free (sess); /* tell hexchat.c about it */ } /* cleanup an IRC tab */ @@ -1079,7 +1079,7 @@ mg_ircdestroy (session *sess) /* kill the user list */ g_object_unref (G_OBJECT (sess->res->user_model)); - session_free (sess); /* tell xchat.c about it */ + session_free (sess); /* tell hexchat.c about it */ if (mg_gui == NULL) { @@ -1243,7 +1243,7 @@ mg_open_quit_dialog (gboolean minimize_button) cons = mg_count_networks (); if (dccs + cons == 0 || !prefs.hex_gui_quit_dialog) { - xchat_exit (); + hexchat_exit (); return; } @@ -1320,7 +1320,7 @@ mg_open_quit_dialog (gboolean minimize_button) case 0: if (GTK_TOGGLE_BUTTON (checkbutton1)->active) prefs.hex_gui_quit_dialog = 0; - xchat_exit (); + hexchat_exit (); break; case 1: /* minimize to tray */ if (GTK_TOGGLE_BUTTON (checkbutton1)->active) @@ -1694,7 +1694,7 @@ mg_dnd_drop_file (session *sess, char *target, char *uri) if (fname) { /* dcc_send() expects utf-8 */ - p = xchat_filename_to_utf8 (fname, -1, 0, 0, 0); + p = hexchat_filename_to_utf8 (fname, -1, 0, 0, 0); if (p) { dcc_send (sess, target, p, prefs.hex_dcc_max_send_cps, 0); @@ -1829,7 +1829,7 @@ mg_tabwindow_kill_cb (GtkWidget *win, gpointer userdata) session *sess; /* puts("enter mg_tabwindow_kill_cb");*/ - xchat_is_quitting = TRUE; + hexchat_is_quitting = TRUE; /* see if there's any non-tab windows left */ list = sess_list; @@ -1839,7 +1839,7 @@ mg_tabwindow_kill_cb (GtkWidget *win, gpointer userdata) next = list->next; if (!sess->gui->is_tab) { - xchat_is_quitting = FALSE; + hexchat_is_quitting = FALSE; /* puts("-> will not exit, some toplevel windows left");*/ } else { @@ -1895,7 +1895,7 @@ mg_link_irctab (session *sess, int focus) win = mg_changui_destroy (sess); mg_changui_new (sess, sess->res, 0, focus); mg_populate (sess); - xchat_is_quitting = FALSE; + hexchat_is_quitting = FALSE; if (win) gtk_widget_destroy (win); return; @@ -2381,8 +2381,8 @@ mg_create_textarea (session *sess, GtkWidget *box) }; static const GtkTargetEntry dnd_dest_targets[] = { - {"XCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }, - {"XCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } + {"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }, + {"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } }; vbox = gtk_vbox_new (FALSE, 0); @@ -3621,7 +3621,7 @@ mg_is_gui_target (GdkDragContext *context) target_name = gdk_atom_name (context->targets->data); if (target_name) { - /* if it's not XCHAT_CHANVIEW or XCHAT_USERLIST */ + /* if it's not HEXCHAT_CHANVIEW or HEXCHAT_USERLIST */ /* we should ignore it. */ if (target_name[0] != 'X') { diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 572335ab..c649a76a 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -113,7 +113,7 @@ static void nick_command (session * sess, char *cmd) { if (*cmd == '!') - xchat_exec (cmd + 1); + hexchat_exec (cmd + 1); else handle_command (sess, cmd, TRUE); } @@ -516,7 +516,7 @@ menu_create (GtkWidget *menu, GSList *list, char *target, int check_path) { char *icon, *label; - /* default command in xchat.c */ + /* default command in hexchat.c */ if (pop->cmd[0] == 'n' && !strcmp (pop->cmd, "notify -n ASK %s")) { /* don't create this item if already in notify list */ @@ -1393,7 +1393,7 @@ menu_pluginlist (void) "%m = machine info\n"\ "%n = your nick\n"\ "%t = time/date\n"\ - "%v = xchat version\n"\ + "%v = HexChat version\n"\ "%2 = word 2\n"\ "%3 = word 3\n"\ "&2 = word 2 to the end of line\n"\ @@ -1438,7 +1438,7 @@ menu_pluginlist (void) "%s = the URL string\n\n"\ "Putting a ! infront of the command\n"\ "indicates it should be sent to a\n"\ - "shell instead of XChat") + "shell instead of HexChat") static void menu_usercommands (void) diff --git a/src/fe-gtk/palette.c b/src/fe-gtk/palette.c index ffa627d5..8866dda7 100644 --- a/src/fe-gtk/palette.c +++ b/src/fe-gtk/palette.c @@ -104,7 +104,7 @@ palette_alloc (GtkWidget * widget) } } -/* maps XChat 2.0.x colors to current */ +/* maps HexChat 2.0.x colors to current */ static const int remap[] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, @@ -128,10 +128,10 @@ palette_load (void) int red, green, blue; int upgrade = FALSE; - fh = xchat_open_file ("colors.conf", O_RDONLY, 0, 0); + fh = hexchat_open_file ("colors.conf", O_RDONLY, 0, 0); if (fh == -1) { - fh = xchat_open_file ("palette.conf", O_RDONLY, 0, 0); + fh = hexchat_open_file ("palette.conf", O_RDONLY, 0, 0); upgrade = TRUE; } @@ -210,7 +210,7 @@ palette_save (void) int i, j, fh; char prefname[256]; - fh = xchat_open_file ("colors.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE); + fh = hexchat_open_file ("colors.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE); if (fh != -1) { /* mIRC colors 0-31 are here */ diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 536719a0..09e6fdb1 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -746,7 +746,7 @@ int tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg) { - /* we need to save this for use with any xchat_* functions */ + /* we need to save this for use with any hexchat_* functions */ ph = plugin_handle; *plugin_name = ""; diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 945facdf..051dd54c 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -61,7 +61,7 @@ rawlog_save (server *serv, char *file) if (file) { if (serv->gui->rawlog_window) - fh = xchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, + fh = hexchat_open_file (file, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE | XOF_FULLPATH); if (fh != -1) { diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 40faaecc..4aeaf00f 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -1224,7 +1224,7 @@ servlist_delete_cb (GtkWidget *win, GdkEventAny *event, gpointer userdata) selected_net = NULL; if (sess_list == NULL) - xchat_exit (); + hexchat_exit (); return FALSE; } @@ -1238,7 +1238,7 @@ servlist_close_cb (GtkWidget *button, gpointer userdata) selected_net = NULL; if (sess_list == NULL) - xchat_exit (); + hexchat_exit (); } /* convert "host:port" format to "host/port" */ diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a3e9f6da..27049dd9 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -2298,7 +2298,7 @@ setup_apply (struct hexchatprefs *pr) static void setup_apply_cb (GtkWidget *but, GtkWidget *win) { - /* setup_prefs -> xchat */ + /* setup_prefs -> hexchat */ setup_apply (&setup_prefs); } #endif diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c index 190c62e7..8c035c5a 100644 --- a/src/fe-gtk/sexy-spell-entry.c +++ b/src/fe-gtk/sexy-spell-entry.c @@ -286,7 +286,7 @@ insert_underline(SexySpellEntry *entry, guint start, guint end) PangoAttribute *ucolor; PangoAttribute *unline; - fh = xchat_open_file ("colors.conf", O_RDONLY, 0, 0); + fh = hexchat_open_file ("colors.conf", O_RDONLY, 0, 0); if (fh != -1) { diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c index e6d57891..f46451a9 100644 --- a/src/fe-gtk/userlistgui.c +++ b/src/fe-gtk/userlistgui.c @@ -612,11 +612,11 @@ userlist_create (GtkWidget *box) static const GtkTargetEntry dnd_dest_targets[] = { {"text/uri-list", 0, 1}, - {"XCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 } + {"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 } }; static const GtkTargetEntry dnd_src_target[] = { - {"XCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } + {"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 } }; sw = gtk_scrolled_window_new (NULL, NULL); diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c index 62cb0776..18b6014b 100644 --- a/src/fe-gtk/xtext.c +++ b/src/fe-gtk/xtext.c @@ -21,7 +21,7 @@ * */ -#define XCHAT /* using xchat */ +#define HEXCHAT /* using HexChat */ #define TINT_VALUE 195 /* 195/255 of the brightness. */ #define MOTION_MONITOR /* URL hilights. */ #define SMOOTH_SCROLL /* line-by-line or pixel scroll? */ @@ -49,7 +49,7 @@ #include <gtk/gtkversion.h> #include <gtk/gtkwindow.h> -#ifdef XCHAT +#ifdef HEXCHAT #ifdef WIN32 #include "../../config-win32.h" #else @@ -161,7 +161,7 @@ enum static guint xtext_signals[LAST_SIGNAL]; -#ifdef XCHAT +#ifdef HEXCHAT char *nocasestrstr (const char *text, const char *tofind); /* util.c */ int xtext_get_stamp_str (time_t, char **); #endif @@ -203,7 +203,7 @@ static gboolean gtk_xtext_search_init (xtext_buffer *buf, const gchar *text, gtk /* some utility functions first */ -#ifndef XCHAT /* xchat has this in util.c */ +#ifndef HEXCHAT /* HexChat has this in util.c */ static char * nocasestrstr (const char *s, const char *tofind) @@ -799,7 +799,7 @@ gtk_xtext_init (GtkXText * xtext) targets, n_targets); } - if (getenv ("XCHAT_OVERDRAW")) + if (getenv ("HEXCHAT_OVERDRAW")) xtext->overdraw = TRUE; } @@ -4338,7 +4338,7 @@ gtk_xtext_render_line (GtkXText * xtext, textentry * ent, int line, indent = ent->indent; start_subline = subline; -#ifdef XCHAT +#ifdef HEXCHAT /* draw the timestamp */ if (xtext->auto_indent && xtext->buffer->time_stamp && (!xtext->skip_stamp || xtext->mark_stamp || xtext->force_stamp)) @@ -4514,7 +4514,7 @@ gtk_xtext_set_font (GtkXText *xtext, char *name) xtext->space_width = xtext->fontwidth[' ']; xtext->fontsize = xtext->font->ascent + xtext->font->descent; -#ifdef XCHAT +#ifdef HEXCHAT { char *time_str; int stamp_size = xtext_get_stamp_str (time(0), &time_str); |