diff options
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 14 | ||||
| -rw-r--r-- | src/fe-gtk/fe-gtk.vcxproj | 2 | ||||
| -rw-r--r-- | src/fe-gtk/joind.c | 8 | ||||
| -rw-r--r-- | src/fe-gtk/menu.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index c8a80369..acba80a5 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -220,26 +220,26 @@ fe_args (int argc, char *argv[]) if (arg_show_version) { + buffer = g_strdup_printf ("%s %s", PACKAGE_NAME, PACKAGE_VERSION); #ifdef WIN32 - buffer = g_strdup_printf (DISPLAY_NAME " " PACKAGE_VERSION "\n"); gtk_init (&argc, &argv); create_msg_dialog ("Version Information", buffer); - g_free (buffer); #else - printf (PACKAGE_NAME" "PACKAGE_VERSION"\n"); + puts (buffer); #endif + g_free (buffer); return 0; } if (arg_show_autoload) { - buffer = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "addons\n", get_xdir ()); + buffer = g_strdup_printf ("%s%caddons%c", get_xdir(), G_DIR_SEPARATOR, G_DIR_SEPARATOR); #ifdef WIN32 gtk_init (&argc, &argv); create_msg_dialog ("Plugin/Script Auto-load Directory", buffer); #else - printf (buffer); + puts (buffer); #endif g_free (buffer); @@ -248,12 +248,12 @@ fe_args (int argc, char *argv[]) if (arg_show_config) { - buffer = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "\n", get_xdir ()); + buffer = g_strdup_printf ("%s%c", get_xdir(), G_DIR_SEPARATOR); #ifdef WIN32 gtk_init (&argc, &argv); create_msg_dialog ("User Config Directory", buffer); #else - printf (buffer); + puts (buffer); #endif g_free (buffer); diff --git a/src/fe-gtk/fe-gtk.vcxproj b/src/fe-gtk/fe-gtk.vcxproj index 0c149928..f8c6377a 100644 --- a/src/fe-gtk/fe-gtk.vcxproj +++ b/src/fe-gtk/fe-gtk.vcxproj @@ -59,7 +59,6 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -81,7 +80,6 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index b58d662a..55d62e3b 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -34,6 +34,7 @@ #include "../common/hexchat.h" #include "../common/hexchatc.h" #include "../common/server.h" +#include "../common/servlist.h" #include "../common/fe.h" #include "fe-gtk.h" #include "chanlist.h" @@ -241,6 +242,13 @@ joind_show_dialog (server *serv) G_CALLBACK (joind_radio2_cb), serv); g_signal_connect (G_OBJECT (okbutton1), "clicked", G_CALLBACK (joind_ok_cb), serv); + + if (serv->network) + if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0) + { + gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radiobutton2), TRUE); + } gtk_widget_grab_focus (okbutton1); gtk_widget_show_all (dialog1); diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 1948348a..58c28e51 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1545,7 +1545,7 @@ menu_ctcpguiopen (void) static void menu_docs (GtkWidget *wid, gpointer none) { - fe_open_url ("http://docs.hexchat.org/"); + fe_open_url ("http://hexchat.readthedocs.org"); } /*static void diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index 9bcd9828..2d46b95f 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -542,7 +542,7 @@ static const setting logging_settings[] = {ST_HEADER, N_("Logging"),0,0,0}, {ST_TOGGLE, N_("Display scrollback from previous session"), P_OFFINTNL(hex_text_replay), 0, 0, 0}, {ST_NUMBER, N_("Scrollback lines:"), P_OFFINTNL(hex_text_max_lines),0,0,100000}, - {ST_TOGGLE, N_("Enable logging of conversations to disk"), P_OFFINTNL(hex_irc_logging), 0, 0, 1}, + {ST_TOGGLE, N_("Enable logging of conversations to disk"), P_OFFINTNL(hex_irc_logging), 0, 0, 0}, {ST_ENTRY, N_("Log filename:"), P_OFFSETNL(hex_irc_logmask), 0, 0, sizeof prefs.hex_irc_logmask}, {ST_LABEL, N_("%s=Server %c=Channel %n=Network.")}, |