moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Make the About screen and CTCP VERSION consistent and remove the license text option

This commit is contained in:
Berke Viktor 2012-07-13 19:20:55 +02:00
parent 2e73e51505
commit cc28cc0177
6 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cfgfiles.c
View File

@ -444,7 +444,6 @@ const struct prefs vars[] = {
{"gui_input_style", P_OFFINT (style_inputbox), TYPE_BOOL},
{"gui_join_dialog", P_OFFINT (gui_join_dialog), TYPE_BOOL},
{"gui_lagometer", P_OFFINT (lagometer), TYPE_INT},
{"gui_license", P_OFFSET (gui_license), TYPE_STR},
{"gui_mode_buttons", P_OFFINT (chanmodebuttons), TYPE_BOOL},
#ifdef WIN32
{"gui_one_instance", P_OFFINT (gui_one_instance), TYPE_BOOL},
@ -736,7 +735,6 @@ load_config (void)
#ifdef WIN32
prefs.identd = 1;
#endif
strcpy (prefs.gui_license, "");
strcpy (prefs.spell_langs, g_getenv ("LC_ALL") ? g_getenv ("LC_ALL") : "en_US");
strcpy (prefs.stamp_format, "[%H:%M] ");
strcpy (prefs.timestamp_log_format, "%b %d %H:%M:%S ");

2
src/common/ctcp.c
View File

@ -141,7 +141,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
get_cpu_arch (), get_cpu_str ());
#else
snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" %s",
snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" / %s",
get_cpu_str ());
#endif
serv->p_nctcp (serv, nick, outbuf);

1
src/common/xchat.h
View File

@ -121,7 +121,6 @@ struct xchatprefs
char font_normal[FONTNAMELEN + 1];
#endif
char doubleclickuser[256];
char gui_license[64];
char spell_langs[64];
char sounddir[PATHLEN + 1];
char soundcmd[PATHLEN + 1];

25
src/fe-gtk/about.c
View File

@ -115,37 +115,32 @@ menu_about (GtkWidget * wid, gpointer sess)
g_get_charset (&locale);
(snprintf) (buf, sizeof (buf),
"<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n"
#ifdef WIN32
"%s%s%s"
"\n<b>XChat Revision</b>: r"XCHAT_REVISION"\n\n"
"\n%s\n\n"
"<b>XChat Revision</b>: r"XCHAT_REVISION"\n"
"<b>OS</b>: %s\n"
"<b>Charset</b>: %s "
#ifdef WIN32
"<b>GTK+</b>: %i.%i.%i\n"
#else
"<b>Renderer</b>: %s\n"
#endif
"<b>Compiled</b>: "__DATE__"\n"
#ifdef WIN32
"<b>Portable Mode</b>: %s\n"
"<b>Build Type</b>: x%d\n\n"
#endif
"<small>\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org>\n"
"\302\251 2009-2011 Berke Viktor &lt;bviktor@hexchat.org></small>",
(strcmp (prefs.gui_license, "") ? "<span size=\"x-large\">" : ""),
(strcmp (prefs.gui_license, "") ? prefs.gui_license : ""),
(strcmp (prefs.gui_license, "") ? "</span>\n" : ""),
_("A multiplatform IRC Client"),
get_cpu_str (),
locale,
#ifdef WIN32
gtk_major_version,
gtk_minor_version,
gtk_micro_version,
(portable_mode () ? "Yes" : "No"),
get_cpu_arch ()
#else
"\n%s\n\n"
"%s\n"
"<b>Charset</b>: %s "
"<b>Renderer</b>: %s\n"
"<b>Compiled</b>: "__DATE__"\n\n"
"<small>\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org></small>",
_("A multiplatform IRC Client"),
get_cpu_str (),
locale,
#ifdef USE_XFT
"Xft"
#else

11
src/fe-gtk/maingui.c
View File

@ -479,21 +479,10 @@ fe_set_title (session *sess)
default:
def:
snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME);
if (strcmp (prefs.gui_license, "")) /* zero means gui_license is empty */
{
strcat (tbuf, " - ");
strcat (tbuf, prefs.gui_license);
}
gtk_window_set_title (GTK_WINDOW (sess->gui->window), tbuf);
return;
}
if (strcmp (prefs.gui_license, "")) /* zero means gui_license is empty */
{
strcat (tbuf, " - ");
strcat (tbuf, prefs.gui_license);
}
gtk_window_set_title (GTK_WINDOW (sess->gui->window), tbuf);
}

2
src/fe-gtk/setup.c
View File

@ -416,7 +416,6 @@ static const setting advanced_settings[] =
{ST_TOGGLE, N_("Display MODEs in raw form"), P_OFFINTNL(raw_modes), 0, 0, 0},
{ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0},
{ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0},
{ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license},
{ST_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},
{ST_TOGGLE, N_("Receive window"), P_OFFINTNL(autoopendccrecvwindow), 0, 0, 0},
@ -434,7 +433,6 @@ static const setting advanced_settings_oneinstance[] =
{ST_TOGGLE, N_("Whois on notify"), P_OFFINTNL(whois_on_notifyonline), N_("Sends a /WHOIS when a user comes online in your notify list"), 0, 0},
{ST_TOGGLE, N_("Hide join and part messages"), P_OFFINTNL(confmode), N_("Hide channel join/part messages by default"), 0, 0},
{ST_TOGGLE, N_("Allow only one instance of XChat to run"), P_OFFINTNL(gui_one_instance), 0, 0, 0},
{ST_ENTRY, N_("License Text:"), P_OFFSETNL(gui_license), 0, 0, sizeof prefs.gui_license},
{ST_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(autoopendccsendwindow), 0, 0, 0},
{ST_TOGGLE, N_("Receive window"), P_OFFINTNL(autoopendccrecvwindow), 0, 0, 0},