diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/dbus/dbus-plugin.c | 4 | ||||
| -rw-r--r-- | src/common/plugin.c | 6 | ||||
| -rw-r--r-- | src/common/text.c | 4 | ||||
| -rw-r--r-- | src/fe-gtk/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/pixmaps.c | 6 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 2 | ||||
| -rw-r--r-- | src/fe-text/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fe-text/fe-text.c | 2 | ||||
| -rw-r--r-- | src/pixmaps/Makefile.am | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c index 012812cc..30a133e6 100644 --- a/src/common/dbus/dbus-plugin.c +++ b/src/common/dbus/dbus-plugin.c @@ -31,8 +31,8 @@ #define PDESC _("plugin for remote access using DBUS") #define PVERSION "" -#define DBUS_SERVICE "org.xchat.service" -#define DBUS_OBJECT_PATH "/org/xchat" +#define DBUS_SERVICE "org.hexchat.service" +#define DBUS_OBJECT_PATH "/org/hexchat" static xchat_plugin *ph; static guint last_context_id = 0; diff --git a/src/common/plugin.c b/src/common/plugin.c index 41293129..71e1ae61 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -451,10 +451,10 @@ plugin_auto_load (session *sess) for_files (get_xdir_fs (), "*.dll", plugin_auto_load_cb); #else #if defined(__hpux) - for_files (XCHATLIBDIR"/plugins", "*.sl", plugin_auto_load_cb); + for_files (HEXCHATLIBDIR"/plugins", "*.sl", plugin_auto_load_cb); for_files (get_xdir_fs (), "*.sl", plugin_auto_load_cb); #else - for_files (XCHATLIBDIR"/plugins", "*.so", plugin_auto_load_cb); + for_files (HEXCHATLIBDIR"/plugins", "*.so", plugin_auto_load_cb); for_files (get_xdir_fs (), "*.so", plugin_auto_load_cb); #endif #endif @@ -1007,7 +1007,7 @@ xchat_get_info (xchat_plugin *ph, const char *id) switch (hash) { case 0x325acab5: /* libdirfs */ - return XCHATLIBDIR; + return HEXCHATLIBDIR; case 0x14f51cd8: /* version */ return PACKAGE_VERSION; diff --git a/src/common/text.c b/src/common/text.c index f8afc4b3..25dd5cf1 100644 --- a/src/common/text.c +++ b/src/common/text.c @@ -586,7 +586,7 @@ log_create_pathname (char *servname, char *channame, char *netname) #endif snprintf (fname, sizeof (fname), "%s", fnametime); else - snprintf (fname, sizeof (fname), "%s/xchatlogs/%s", get_xdir_utf8 (), fnametime); + snprintf (fname, sizeof (fname), "%s/logs/%s", get_xdir_utf8 (), fnametime); /* now we need it in FileSystem encoding */ fs = xchat_filename_from_utf8 (fname, -1, 0, 0, 0); @@ -641,7 +641,7 @@ log_open (session *sess) char message[512]; snprintf (message, sizeof (message), _("* Can't open log file(s) for writing. Check the\n" \ - " permissions on %s/xchatlogs"), get_xdir_utf8 ()); + " permissions on %s/logs"), get_xdir_utf8 ()); fe_message (message, FE_MSG_WAIT | FE_MSG_ERROR); log_error = TRUE; diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index da36ed57..a8cbcb63 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -1,6 +1,6 @@ localedir = $(datadir)/locale -bin_PROGRAMS = xchat +bin_PROGRAMS = hexchat INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\" diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 88a1138c..8c7e515a 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -257,7 +257,7 @@ fe_args (int argc, char *argv[]) } } #else - printf ("%s\n", XCHATLIBDIR"/plugins"); + printf ("%s\n", HEXCHATLIBDIR"/plugins"); #endif return 0; } diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c index 3d85c3b0..4cac3801 100644 --- a/src/fe-gtk/pixmaps.c +++ b/src/fe-gtk/pixmaps.c @@ -86,12 +86,12 @@ pixmap_load_from_file (char *filename) } #define LOADPIX(vv,pp,ff) \ - vv = gdk_pixbuf_new_from_file (XCHATSHAREDIR"/xchat/"ff, 0); \ + vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0); \ if (!vv) \ vv = gdk_pixbuf_new_from_inline (-1, pp, FALSE, 0); #define LOADPIX_DISKONLY(vv,ff) \ - vv = gdk_pixbuf_new_from_file (XCHATSHAREDIR"/xchat/"ff, 0); + vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0); #define EXT ".png" @@ -101,7 +101,7 @@ pixmaps_init (void) pix_book = gdk_pixbuf_new_from_inline (-1, bookpng, FALSE, 0); /* used in About window, tray icon and WindowManager icon. */ - LOADPIX (pix_xchat, xchatpng, "xchat"EXT); + LOADPIX (pix_xchat, hexchatpng, "hexchat"EXT); /* userlist icons, with inlined defaults */ LOADPIX (pix_hop, hoppng, "hop"EXT); diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index b9f60f8d..ff6e0e05 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -162,7 +162,7 @@ fe_tray_set_balloon (const char *title, const char *text) notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); notify_title = strip_color (title, -1, STRIP_ALL); - notification = XC_NOTIFY_NEW (notify_title, notify_text, XCHATSHAREDIR"/pixmaps/xchat.png", NULL); + notification = XC_NOTIFY_NEW (notify_title, notify_text, HEXCHATSHAREDIR"/pixmaps/hexchat.png", NULL); g_free ((char *)notify_title); g_free ((char *)notify_text); diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index ef48203e..065b3e76 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = xchat-text +bin_PROGRAMS = hexchat-text EXTRA_DIST = README diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c index f3c1ff05..514d4be0 100644 --- a/src/fe-text/fe-text.c +++ b/src/fe-text/fe-text.c @@ -506,7 +506,7 @@ fe_args (int argc, char *argv[]) printf ("%s\\plugins\n", exe); } #else - printf ("%s\n", XCHATLIBDIR"/plugins"); + printf ("%s\n", HEXCHATLIBDIR"/plugins"); #endif return 0; } diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index 5476f9d4..6dff376c 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -9,7 +9,7 @@ LIST = traymsgpng $(srcdir)/message.png \ purplepng $(srcdir)/purple.png \ redpng $(srcdir)/red.png \ voicepng $(srcdir)/voice.png \ - xchatpng $(srcdir)/../../xchat.png + hexchatpng $(srcdir)/../../hexchat.png PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png noinst_HEADERS = inline_pngs.h |