iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the last remnants of XChat-WDK

Browse Source
This commit is contained in:
Berke Viktor
2012-07-13 22:27:12 +02:00
parent e500363aff
commit f61726ba49
11 changed files with 56 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/fe-gtk/plugin-tray.c
View File

@ -220,10 +220,10 @@ tray_stop_flash (void)
nets = tray_count_networks ();
chans = tray_count_channels ();
if (nets)
tray_set_tipf (_("XChat-WDK: Connected to %u networks and %u channels"),
tray_set_tipf (_(DISPLAY_NAME": Connected to %u networks and %u channels"),
nets, chans);
else
tray_set_tipf ("XChat-WDK: %s", _("Not connected."));
tray_set_tipf (DISPLAY_NAME": %s", _("Not connected."));
}
if (custom_icon1)
@ -580,15 +580,15 @@ tray_hilight_cb (char *word[], void *userdata)
/* FIXME: hides any previous private messages */
tray_hilight_count++;
if (tray_hilight_count == 1)
tray_set_tipf (_("XChat-WDK: Highlighted message from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
else
tray_set_tipf (_("XChat-WDK: %u highlighted messages, latest from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": %u highlighted messages, latest from: %s (%s)"),
tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
}
if (prefs.input_balloon_hilight)
tray_set_balloonf (word[2], _("XChat-WDK: Highlighted message from: %s (%s)"),
tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE;
@ -606,14 +606,14 @@ tray_message_cb (char *word[], void *userdata)
tray_pub_count++;
if (tray_pub_count == 1)
tray_set_tipf (_("XChat-WDK: New public message from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
else
tray_set_tipf (_("XChat-WDK: %u new public messages."), tray_pub_count);
tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count);
}
if (prefs.input_balloon_chans)
tray_set_balloonf (word[2], _("XChat-WDK: New public message from: %s (%s)"),
tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
return XCHAT_EAT_NONE;
@ -635,14 +635,14 @@ tray_priv (char *from, char *text)
tray_priv_count++;
if (tray_priv_count == 1)
tray_set_tipf (_("XChat-WDK: Private message from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": Private message from: %s (%s)"),
from, network);
else
tray_set_tipf (_("XChat-WDK: %u private messages, latest from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
tray_priv_count, from, network);
if (prefs.input_balloon_priv)
tray_set_balloonf (text, _("XChat-WDK: Private message from: %s (%s)"),
tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"),
from, network);
}
@ -688,15 +688,15 @@ tray_dcc_cb (char *word[], void *userdata)
tray_file_count++;
if (tray_file_count == 1)
tray_set_tipf (_("XChat-WDK: File offer from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": File offer from: %s (%s)"),
word[1], network);
else
tray_set_tipf (_("XChat-WDK: %u file offers, latest from: %s (%s)"),
tray_set_tipf (_(DISPLAY_NAME": %u file offers, latest from: %s (%s)"),
tray_file_count, word[1], network);
}
if (prefs.input_balloon_priv)
tray_set_balloonf ("", _("XChat-WDK: File offer from: %s (%s)"),
tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
word[1], network);
return XCHAT_EAT_NONE;

2
src/gtk2-prefs/interface.cpp
View File

@ -304,7 +304,7 @@ create_main_window (void)
gtk_widget_show (image2);
gtk_box_pack_start (GTK_BOX (hbox6665), image2, FALSE, FALSE, 0);
label2 = gtk_label_new ("You should restart XChat-WDK\nfor this change to take effect.");
label2 = gtk_label_new ("You should restart HexChat\nfor this change to take effect.");
gtk_widget_set_name (label2, "label2");
gtk_widget_show (label2);
gtk_box_pack_start (GTK_BOX (hbox6665), label2, FALSE, FALSE, 0);

40
src/version/version.c
View File

@ -1,27 +1,23 @@
/* XChat-WDK
* Copyright (c) 2011 Berke Viktor.
/* HexChat
* Copyright (c) 2011-2012 Berke Viktor.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <stdio.h>