17424N/A--- stardict-3.0.1.orig/configure.in 2007-11-01 15:37:15.000000000 +0800
17424N/A+++ stardict-3.0.1/configure.in 2008-05-26 11:21:41.149842533 +0800
17424N/A STARDICT_CFLAGS="$STARDICT_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
17424N/A--- stardict-3.0.1.orig/src/conf.h 2007-07-17 18:28:09.000000000 +0800
17424N/A+++ stardict-3.0.1/src/conf.h 2008-05-26 15:04:40.581739429 +0800
17424N/A--- stardict-3.0.1.orig/src/docklet.cpp 2007-10-25 14:57:22.000000000 +0800
17424N/A+++ stardict-3.0.1/src/docklet.cpp 2008-05-26 15:12:52.478749205 +0800
17424N/A--- stardict-3.0.1.orig/src/docklet.h 2007-10-25 14:53:06.000000000 +0800
17424N/A+++ stardict-3.0.1/src/docklet.h 2008-05-26 15:12:18.558429684 +0800
17424N/A #include "eggtrayicon.h"
17424N/A--- stardict-3.0.1.orig/src/inifile.cpp 2007-08-01 17:43:00.000000000 +0800
17424N/A+++ stardict-3.0.1/src/inifile.cpp 2008-05-26 15:45:47.788673629 +0800
17424N/A--- stardict-3.0.1.orig/src/lib/m_string.h 2007-07-10 15:16:03.000000000 +0800
17424N/A+++ stardict-3.0.1/src/lib/m_string.h 2008-05-26 11:18:59.057023698 +0800
17424N/A--- stardict-3.0.1.orig/src/lib/sockets.cpp 2007-09-12 17:11:41.000000000 +0800
17424N/A+++ stardict-3.0.1/src/lib/sockets.cpp 2008-05-26 16:38:51.400623697 +0800
17424N/A # include <sys/types.h>
17424N/A # include <sys/socket.h>
17424N/A # include <netinet/in.h>
17424N/A+# include <arpa/inet.h>
17424N/A--- stardict-3.0.1.orig/src/skin.cpp 2007-07-10 15:16:04.000000000 +0800
17424N/A+++ stardict-3.0.1/src/skin.cpp 2008-05-26 15:08:47.794321291 +0800
17424N/A watch_cursor.reset(gdk_cursor_new(GDK_WATCH));
17424N/A--- stardict-3.0.1.orig/src/skin.h 2007-07-10 15:16:04.000000000 +0800
17424N/A+++ stardict-3.0.1/src/skin.h 2008-05-26 15:11:45.626038404 +0800
17424N/A--- stardict-3.0.1.orig/src/utils.cpp 2007-10-22 10:25:02.000000000 +0800
17424N/A+++ stardict-3.0.1/src/utils.cpp 2008-05-26 15:42:54.173151303 +0800
17424N/A--- stardict-3.0.1.orig/src/utils.h 2007-09-06 11:30:19.000000000 +0800
17424N/A+++ stardict-3.0.1/src/utils.h 2008-05-26 15:42:43.780182458 +0800
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-advertisement-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/Makefile.am
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-advertisement-plugin/Makefile.am 2007-07-18 14:24:09.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/Makefile.am 2008-05-26 15:28:04.327074322 +0800
17424N/A-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=advertisement.v"
17424N/A+LD_VERSION_SCRIPT_OPTION="-export-symbols advertisement.v"
17424N/A noinst_HEADERS = advertisement.h
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2007-09-21 09:09:53.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-05-26 15:37:00.443136591 +0800
17424N/A dictentry.word = *i;
17424N/A- dict_map.insert(std::pair<std::string, DictEntry>(lower_str, dictentry));
17424N/A+ dict_map.insert(std::pair<const std::string, DictEntry>(lower_str, dictentry));
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-dictdotcn-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/Makefile.am
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-dictdotcn-plugin/Makefile.am 2007-09-06 16:54:57.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/Makefile.am 2008-05-26 15:28:52.746339566 +0800
17424N/A-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_dictdotcn.v"
17424N/A+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_dictdotcn.v"
17424N/A noinst_HEADERS = stardict_dictdotcn.h
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/Makefile.am
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/Makefile.am 2007-07-11 16:16:53.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/Makefile.am 2008-05-26 15:29:21.984435743 +0800
17424N/A EXTRA_DIST = stardict_espeak.v
17424N/A-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_espeak.v"
17424N/A+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_espeak.v"
17424N/A noinst_HEADERS = stardict_espeak.h
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-festival-tts-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-festival-tts-plugin/Makefile.am
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-festival-tts-plugin/Makefile.am 2007-07-11 16:17:19.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-festival-tts-plugin/Makefile.am 2008-05-26 15:28:29.180255184 +0800
17424N/A EXTRA_DIST = stardict_festival.v
17424N/A-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_festival.v"
17424N/A+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_festival.v"
17424N/A noinst_HEADERS = stardict_festival.h
17424N/Adiff -ur stardict-3.0.1.orig/stardict-plugins/stardict-gucharmap-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/Makefile.am
17424N/A--- stardict-3.0.1.orig/stardict-plugins/stardict-gucharmap-plugin/Makefile.am 2007-07-11 16:17:42.000000000 +0800
17424N/A+++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/Makefile.am 2008-05-26 15:27:30.550324726 +0800
17424N/A EXTRA_DIST = stardict_gucharmap.v
17424N/A-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_gucharmap.v"
17424N/A+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_gucharmap.v"
17424N/A noinst_HEADERS = stardict_gucharmap.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/Makefile.am 2007-07-18 14:26:15.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/Makefile.am 2008-05-26 15:28:11.635000674 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_html_parsedata.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_html_parsedata.v"
noinst_HEADERS = stardict_html_parsedata.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-man-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-man-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-man-plugin/Makefile.am 2007-07-12 11:19:36.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/Makefile.am 2008-05-26 15:27:42.676256965 +0800
EXTRA_DIST = stardict_man.v
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_man.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_man.v"
noinst_HEADERS = stardict_man.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-powerword-parsedata-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-powerword-parsedata-plugin/Makefile.am 2007-09-14 10:21:25.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/Makefile.am 2008-05-26 15:27:51.807549166 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_powerword_parsedata.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_powerword_parsedata.v"
noinst_HEADERS = stardict_powerword_parsedata.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-qqwry-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-qqwry-plugin/Makefile.am 2007-11-02 16:17:08.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/Makefile.am 2008-05-26 15:28:44.676487966 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_qqwry.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_qqwry.v"
noinst_HEADERS = stardict_qqwry.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-spell-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/Makefile.am 2007-07-11 16:19:02.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/Makefile.am 2008-05-26 15:29:10.408133901 +0800
EXTRA_DIST = stardict_spell.v
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_spell.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_spell.v"
noinst_HEADERS = stardict_spell.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-update-info-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-update-info-plugin/Makefile.am 2007-07-18 14:31:57.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/Makefile.am 2008-05-26 15:28:19.712670791 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_update_info.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_update_info.v"
noinst_HEADERS = stardict_update_info.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-wiki-parsedata-plugin/Makefile.am 2007-07-18 14:30:23.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/Makefile.am 2008-05-26 15:28:36.394186905 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_wiki_parsedata.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_wiki_parsedata.v"
noinst_HEADERS = stardict_wiki_parsedata.h
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/Makefile.am 2007-10-10 14:25:47.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/Makefile.am 2008-05-26 15:37:43.516519401 +0800
-WORDNET_LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_wordnet.v"
+WORDNET_LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_wordnet.v"
stardict_wordnet_LTLIBRARIES = stardict_wordnet.la
-WORDNET_PARSEDATA_LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_wordnet_parsedata.v"
+WORDNET_PARSEDATA_LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_wordnet_parsedata.v"
stardict_wordnet_parsedata_LTLIBRARIES = stardict_wordnet_parsedata.la
diff -ur stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/Makefile.am stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/Makefile.am
--- stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/Makefile.am 2007-07-18 14:29:05.000000000 +0800
+++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/Makefile.am 2008-05-26 15:27:17.097898747 +0800
-LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=stardict_xdxf_parsedata.v"
+LD_VERSION_SCRIPT_OPTION="-export-symbols stardict_xdxf_parsedata.v"
noinst_HEADERS = stardict_xdxf_parsedata.h
--- stardict-3.0.1.orig/tests/t_fuzzy.cpp 2007-07-10 15:16:04.000000000 +0800
+++ stardict-3.0.1/tests/t_fuzzy.cpp 2008-05-26 16:00:31.555165014 +0800
if (time_arr.empty())
time_arr.erase(it);
if (time_arr.empty())
time_arr.erase(it);
if (time_arr.empty())
--- stardict-3.0.1.orig/tests/t_lookupdata.cpp 2007-07-10 15:16:04.000000000 +0800
+++ stardict-3.0.1/tests/t_lookupdata.cpp 2008-05-26 16:39:56.834928090 +0800
libs.load(dict_list);
- std::vector<gchar *> reslist[dictmask.size()];
+ std::vector<gchar *> *reslist = new std::vector<gchar *>[dictmask.size()];
if (libs.LookupData("letter", reslist, NULL, NULL, NULL, dictmask))
--- stardict-3.0.1.orig/src/desktop.cpp 2010-11-04 15:18:48.628310664 +0800
+++ stardict-3.0.1/src/desktop.cpp 2010-11-04 15:01:46.631841021 +0800
PlaySound(filename.c_str(), 0, SND_ASYNC | SND_FILENAME);
- gnome_sound_play(filename.c_str());
+ // gnome_sound_play(filename.c_str());
conf->get_string_at("dictionary/play_command");
--- stardict-3.0.1.orig/src/docklet.cpp 2010-11-04 15:18:48.601158687 +0800
+++ stardict-3.0.1/src/docklet.cpp 2010-11-04 15:01:46.540091047 +0800
dock->on_change_scan_.emit(!dock->is_scan_on());
--- stardict-3.0.1.orig/src/eggtrayicon.c 2010-11-04 15:18:48.596625145 +0800
+++ stardict-3.0.1/src/eggtrayicon.c 2010-11-04 15:01:46.687265692 +0800
--- stardict-3.0.1.orig/src/floatwin.cpp 2010-11-04 15:18:48.600057646 +0800
+++ stardict-3.0.1/src/floatwin.cpp 2010-11-04 15:01:46.592258829 +0800
window_height = 2*(FLOATWIN_BORDER_WIDTH+2) + requisition.height;
conf->get_bool_at("floating_window/lock");
--- stardict-3.0.1.orig/src/mainwin.cpp 2010-11-04 15:18:48.597146605 +0800
+++ stardict-3.0.1/src/mainwin.cpp 2010-11-04 15:01:46.612390306 +0800
--- stardict-3.0.1.orig/src/mainwin.h 2010-11-04 15:18:48.600234389 +0800
+++ stardict-3.0.1/src/mainwin.h 2010-11-04 15:01:46.603749237 +0800
void Show(const struct STARDICT::LookupResponse::DictResponse *dict_response, STARDICT::LookupResponse::ListType list_type);
--- stardict-3.0.1.orig/src/pluginmanagedlg.cpp 2010-11-04 15:18:48.621024877 +0800
+++ stardict-3.0.1/src/pluginmanagedlg.cpp 2010-11-04 15:01:46.535903753 +0800
gboolean PluginManageDlg::on_treeview_button_press(GtkWidget * widget, GdkEventButton * event, PluginManageDlg *oPluginManageDlg)
--- stardict-3.0.1.orig/src/stardict.cpp 2010-11-04 15:18:48.599338906 +0800
+++ stardict-3.0.1/src/stardict.cpp 2010-11-04 15:01:46.607214557 +0800
oMidWin.oIndexWin.oListWin.treeview_, path, NULL, FALSE, 0, 0);
- if (GTK_WIDGET_SENSITIVE(GTK_WIDGET(oMidWin.oToolWin.PronounceWordMenuButton)))
+ if (gtk_widget_get_sensitive(GTK_WIDGET(oMidWin.oToolWin.PronounceWordMenuButton)))
+ if (dict_manage_dlg && dict_manage_dlg->window && gtk_widget_get_visible(dict_manage_dlg->window)) {
+ if (dict_manage_dlg && dict_manage_dlg->window && gtk_widget_get_visible(dict_manage_dlg->window)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(oBottomWin.ScanSelectionCheckButton), scan);
bool lock=conf->get_bool_at("floating_window/lock");