diff options
-rw-r--r-- | share/misc/hexchat.desktop | 6 | ||||
-rw-r--r-- | src/common/dbus/example.c | 2 | ||||
-rw-r--r-- | src/common/server.c | 6 | ||||
-rw-r--r-- | src/fe-gtk/chanlist.c | 4 | ||||
-rw-r--r-- | src/fe-gtk/search.c | 5 | ||||
-rw-r--r-- | src/fe-gtk/servlistgui.c | 1 |
6 files changed, 20 insertions, 4 deletions
diff --git a/share/misc/hexchat.desktop b/share/misc/hexchat.desktop index 051686a6..2b11b2cd 100644 --- a/share/misc/hexchat.desktop +++ b/share/misc/hexchat.desktop @@ -16,9 +16,9 @@ GenericName[sv]=IRC-klient GenericName[ro]=Client de IRC GenericName[zh_TW]=HexChat 聊天程式 Comment=Chat with other people using Internet Relay Chat -Comment[fr]=Discuttez avec des gens sur l'Internet Relay Chat -Comment[de]=Chaten mit Leute auf dem Internet Relay Chat -Comment[it]=Chiachierare con gente sul Internet Relay Chat +Comment[fr]=Discutez avec tout le monde sur l'Internet Relay Chat +Comment[de]=Sich über Internet Relay Chat mit andern Leuten unterhalten +Comment[it]=Chiacchierare con la gente sull'Internet Relay Chat Comment[nb]=Snakk med mennesker på Internet Relay Chat Exec=hexchat Icon=hexchat diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c index b78bb004..ee1833d3 100644 --- a/src/common/dbus/example.c +++ b/src/common/dbus/example.c @@ -102,7 +102,9 @@ main (int argc, char **argv) gchar *path; GError *error = NULL; +#if ! GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); if (connection == NULL) { diff --git a/src/common/server.c b/src/common/server.c index 2427ac6d..2f87faad 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -1762,7 +1762,11 @@ server_connect (server *serv, char *hostname, int port, int no_login) serv, 0, (DWORD *)&pid)); #else #ifdef LOOKUPD - rand(); /* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different seed for each child. This method giver a bigger variation in seed values than calling srand(time(0)) in the child itself. */ + /* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different + * seed for each child. This method gives a bigger variation in seed values + * than calling srand(time(0)) in the child itself. + */ + rand(); #endif switch (pid = fork ()) { diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c index 47b9f1db..00c55b5f 100644 --- a/src/fe-gtk/chanlist.c +++ b/src/fe-gtk/chanlist.c @@ -532,6 +532,7 @@ chanlist_minusers (GtkSpinButton *wid, server *serv) { serv->gui->chanlist_minusers = gtk_spin_button_get_value_as_int (wid); prefs.hex_gui_chanlist_minusers = serv->gui->chanlist_minusers; + save_config(); if (serv->gui->chanlist_minusers < serv->gui->chanlist_minusers_downloaded) { @@ -553,6 +554,7 @@ chanlist_maxusers (GtkSpinButton *wid, server *serv) { serv->gui->chanlist_maxusers = gtk_spin_button_get_value_as_int (wid); prefs.hex_gui_chanlist_maxusers = serv->gui->chanlist_maxusers; + save_config(); } static void @@ -725,6 +727,7 @@ chanlist_opengui (server *serv, int do_refresh) if (prefs.hex_gui_chanlist_minusers < 1 || prefs.hex_gui_chanlist_minusers > 999999) { prefs.hex_gui_chanlist_minusers = 5; + save_config(); } serv->gui->chanlist_minusers = prefs.hex_gui_chanlist_minusers; @@ -735,6 +738,7 @@ chanlist_opengui (server *serv, int do_refresh) if (prefs.hex_gui_chanlist_maxusers < 1 || prefs.hex_gui_chanlist_maxusers > 999999) { prefs.hex_gui_chanlist_maxusers = 9999; + save_config(); } serv->gui->chanlist_maxusers = prefs.hex_gui_chanlist_maxusers; diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c index 49c30a14..44cbf3a0 100644 --- a/src/fe-gtk/search.c +++ b/src/fe-gtk/search.c @@ -26,6 +26,7 @@ #include "../common/fe.h" #include "../common/util.h" #include "../common/hexchatc.h" +#include "../common/cfgfiles.h" #include "gtkutil.h" #include "xtext.h" #include "maingui.h" @@ -111,24 +112,28 @@ static void search_caseign_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_case_match = (but->active)? 1: 0; + save_config(); } static void search_dirbwd_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_backward = (but->active)? 1: 0; + save_config(); } static void search_regexp_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_regexp = (but->active)? 1: 0; + save_config(); } static void search_highlight_cb (GtkToggleButton * but, session * sess) { prefs.hex_text_search_highlight_all = (but->active)? 1: 0; + save_config(); search_search (sess, NULL); } diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c index 13df2b15..c04e7257 100644 --- a/src/fe-gtk/servlistgui.c +++ b/src/fe-gtk/servlistgui.c @@ -656,6 +656,7 @@ servlist_savegui (void) sp[0] = 0; /* spaces will break the login */ /* strcpy (prefs.hex_irc_real_name, GTK_ENTRY (entry_greal)->text); */ servlist_save (); + save_config (); /* For nicks stored in hexchat.conf */ return 0; } |