diff options
Diffstat (limited to 'src/common')
| -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 |
3 files changed, 7 insertions, 7 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; |