--- lostirc-0.4.6.orig/src/libirc/Parser.cpp +++ lostirc-0.4.6/src/libirc/Parser.cpp @@ -21,6 +21,7 @@ #include <vector> #include <algorithm> #include <cassert> +#include <ctime> #include "Parser.h" #include "Utils.h" #include "Channel.h" --- lostirc-0.4.6.orig/src/libirc/ConfigValue.h +++ lostirc-0.4.6/src/libirc/ConfigValue.h @@ -28,12 +28,13 @@ public: virtual Glib::ustring getString() = 0; virtual baseConfigValue& operator=(const Glib::ustring&) = 0; + virtual ~baseConfigValue() { } }; template<typename T> class ConfigValue : public baseConfigValue { - T value; + T value; public: ConfigValue() { } --- lostirc-0.4.6.orig/src/libirc/Socket.cpp +++ lostirc-0.4.6/src/libirc/Socket.cpp @@ -27,6 +27,7 @@ #include <iostream> #include <string> +#include <cstring> #include <cerrno> #include <cstdio> #include <glibmm/main.h> @@ -324,7 +325,7 @@ if (new_retval != -1) { bytes_read += new_retval; if (bytes_read != size_to_be_read) { - on_error(_("An error occured while reading from pipe (Internal error 2)")); + on_error(_("An error occurred while reading from pipe (Internal error 2)")); } else { // copy the struct we received into the sockaddr member memcpy(static_cast<void*>(&sockaddr.sin_addr), @@ -334,7 +335,7 @@ on_host_resolved(); } } else { - on_error(_("An error occured while reading from pipe (Internal error 3)")); + on_error(_("An error occurred while reading from pipe (Internal error 3)")); } } else { --- lostirc-0.4.6.orig/src/libirc/FrontEnd.h +++ lostirc-0.4.6/src/libirc/FrontEnd.h @@ -93,7 +93,7 @@ virtual void newDCC(DCC *dcc) = 0; virtual void dccStatusChanged(DCC *dcc) = 0; virtual void localeError(bool tried_custom_encoding) = 0; - + virtual ~FrontEnd() { } }; --- lostirc-0.4.6.orig/src/gtkmm/MainNotebook.h +++ lostirc-0.4.6/src/gtkmm/MainNotebook.h @@ -30,6 +30,8 @@ public: MainNotebook(); + virtual bool on_key_press_event(GdkEventKey* e); + Tab* addTab(Tab::Type type, const Glib::ustring& name, ServerConnection *conn); Tab* getCurrent(ServerConnection *conn = 0); Tab* findTab(const Glib::ustring& name, ServerConnection *conn, bool findInActive = false); --- lostirc-0.4.6.orig/src/gtkmm/MainNotebook.cpp +++ lostirc-0.4.6/src/gtkmm/MainNotebook.cpp @@ -230,3 +230,8 @@ tab->getText().setFont(_fontdesc); } } + +bool MainNotebook::on_key_press_event(GdkEventKey* e) +{ + return true; +} --- lostirc-0.4.6.orig/src/gtkmm/MainWindow.cpp +++ lostirc-0.4.6/src/gtkmm/MainWindow.cpp @@ -23,6 +23,7 @@ #include <gtkmm/box.h> #include <gtkmm/messagedialog.h> #include <gtkmm/actiongroup.h> +#include <gtk/gtkaccelmap.h> #include <gdk/gdkkeysyms.h> #include <sigc++/retype_return.h> #include "DCCList.h" @@ -54,6 +55,7 @@ move(x, y); setupMenus(); + gtk_accel_map_load ((App->home + "/.lostirc/accel.scm").c_str ()); initializeTagTable(); Gtk::VBox *vbox = manage(new Gtk::VBox()); @@ -99,6 +101,7 @@ _app.options.window_y = y; } + gtk_accel_map_save ((App->home + "/.lostirc/accel.scm").c_str ()); AppWin = 0; } @@ -307,7 +310,7 @@ { Glib::ustring msg; if (!tried_custom_encoding) { - msg = _("Locale conversion error. An error occured while converting text from UTF-8 to your current locale.\n\nThis is most likely because your locale is set to a value which doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author."); + msg = _("Locale conversion error. An error occurred while converting text from UTF-8 to your current locale.\n\nThis is most likely because your locale is set to a value which doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author."); char *locale = std::getenv("LANG"); if (locale != NULL) { @@ -315,7 +318,7 @@ msg += locale; } } else { - msg = _("Encoding conversion error. An error occured while converting text from UTF-8 to the user-defined encoding.\n\nThis is most likely because the encoding you have chosen doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author."); + msg = _("Encoding conversion error. An error occurred while converting text from UTF-8 to the user-defined encoding.\n\nThis is most likely because the encoding you have chosen doesn't support the character(s) converting to.\n\nIf you believe this is a bug, please report it to the application author."); msg += _("\n\nI was trying to convert to: "); msg += App->options.encoding;