Home | History | Annotate | Download | only in patches
      1 --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2-Experimental/Makefile.am	2006-09-03 20:45:13.000000000 +0100
      2 +++ dasher-4.2.0/Src/Gtk2-Experimental/Makefile.am	2006-10-10 12:00:53.168741000 +0100
      3 @@ -9,4 +9,4 @@
      4  
      5  AM_CXXFLAGS = $(GTK2_CFLAGS) $(SETTINGS_CFLAGS) $(gnome_speech_CFLAGS) $(gnome_a11y_CFLAGS) $(glade_CFLAGS) $(gnome_CFLAGS) $(gthread_CFLAGS) $(wnck_CFLAGS) -I$(srcdir)/../Gtk2 -I$(srcdir)/../DasherCore -I$(srcdir)/../intl -I$(top_srcdir)/intl -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -DPROGDATA=\"$(pkgdatadir)\"
      6  
      7 -dasher_com_aid_LDFLAGS = $(GTK2_LIBS) $(SETTINGS_LIBS) $(gnome_speech_LIBS) $(gnome_a11y_LIBS) $(glade_LIBS) $(gnome_LIBS) $(gthread_LIBS) $(wnck_LIBS) -lexpat $(X_LIBS) -L../Gtk2 -L../DasherCore -L../DasherCore/LanguageModelling -L../DasherCore/Alphabet -ldashercontrol -ldashercore -ldasherlm -ldasheralphabet 
      8 +dasher_com_aid_LDFLAGS = $(GTK2_LIBS) $(SETTINGS_LIBS) $(gnome_speech_LIBS) $(gnome_a11y_LIBS) $(glade_LIBS) $(gnome_LIBS) $(gthread_LIBS) $(wnck_LIBS) -lexpat $(X_LIBS) -L../Gtk2 -L../DasherCore -L../DasherCore/LanguageModelling -L../DasherCore/Alphabet -L../Common -ldashercontrol -ldashercore -ldasherlm -ldasheralphabet -ldashermisc
      9 --- /usr/tmp/clean/dasher-4.2.0/Src/Makefile.am	2006-09-03 20:45:05.000000000 +0100
     10 +++ dasher-4.2.0/Src/Makefile.am	2006-10-10 12:00:53.169143000 +0100
     11 @@ -33,7 +33,8 @@
     12  	Gtk2/libdashercontrol.a \
     13  	DasherCore/libdashercore.a \
     14  	DasherCore/LanguageModelling/libdasherlm.a \
     15 -	DasherCore/Alphabet/libdasheralphabet.a
     16 +	DasherCore/Alphabet/libdasheralphabet.a \
     17 +	Common/libdashermisc.a
     18  endif
     19  
     20  if DOQTE
     21 --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/DasherView.h	2006-09-03 20:45:06.000000000 +0100
     22 +++ dasher-4.2.0/Src/DasherCore/DasherView.h	2006-10-10 12:00:53.169825000 +0100
     23 @@ -47,7 +47,7 @@
     24  /// mode). We should probably consider creating separate classes for
     25  /// these.
     26  
     27 -class Dasher::CDasherView:public CDasherComponent
     28 +class Dasher::CDasherView:public Dasher::CDasherComponent
     29  {
     30  public:
     31  
     32 --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/KeyboardHelper.h	2006-09-03 20:45:08.000000000 +0100
     33 +++ dasher-4.2.0/Src/Gtk2/KeyboardHelper.h	2006-10-10 12:00:53.181727000 +0100
     34 @@ -7,7 +7,7 @@
     35   public:
     36    CKeyboardHelper();
     37    int ConvertKeycode(int iCode);
     38 -  int Grab(bool bGrab);
     39 +  void Grab(bool bGrab);
     40  
     41   private:
     42    std::map<int, int> m_mTable;
     43 --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/dasher_main.cpp	2006-09-03 20:45:09.000000000 +0100
     44 +++ dasher-4.2.0/Src/Gtk2/dasher_main.cpp	2006-10-10 12:00:53.281237000 +0100
     45 @@ -1047,7 +1047,7 @@
     46  #endif
     47  }
     48  
     49 -gboolean dasher_main_alphabet_combo_changed(DasherMain *pSelf) {
     50 +void dasher_main_alphabet_combo_changed(DasherMain *pSelf) {
     51    DasherMainPrivate *pPrivate = (DasherMainPrivate *)(pSelf->private_data);
     52  
     53    GtkTreeIter sIter;
     54 --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/KeyboardHelper.cpp	2006-09-03 20:45:08.000000000 +0100
     55 +++ dasher-4.2.0/Src/Gtk2/KeyboardHelper.cpp	2006-10-10 12:00:53.282878000 +0100
     56 @@ -75,7 +75,7 @@
     57      return -1;
     58  }
     59  
     60 -int CKeyboardHelper::Grab(bool bGrab) {
     61 +void CKeyboardHelper::Grab(bool bGrab) {
     62    for(std::map<int,int>::iterator it(m_mTable.begin()); it != m_mTable.end(); ++it) {
     63      GdkKeymapKey *pKeys;
     64      int iKeysLength;
     65 --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/SocketInputBase.cpp	2006-09-03 20:45:07.000000000 +0100
     66 +++ dasher-4.2.0/Src/DasherCore/SocketInputBase.cpp	2006-10-10 13:38:25.228048000 +0100
     67 @@ -11,6 +11,7 @@
     68  #include <string.h>
     69  #include <errno.h>
     70  #include <stdarg.h>
     71 +#include <unistd.h>
     72  #ifdef WIN32
     73   #include <winsock2.h>
     74   #define DASHER_SOCKET_CLOSE_FUNCTION closesocket
     75 --- /usr/tmp/clean/dasher-4.2.0/Src/DasherCore/DasherNode.h	2006-09-03 20:45:06.000000000 +0100
     76 +++ dasher-4.2.0/Src/DasherCore/DasherNode.h	2006-10-10 12:00:53.284902000 +0100
     77 @@ -95,7 +95,7 @@
     78      return m_iColour;
     79    } 
     80  
     81 -  int SetColour(int iColour) {
     82 +  void SetColour(int iColour) {
     83      m_iColour = iColour;
     84    }
     85  
     86 --- /usr/tmp/clean/dasher-4.2.0/Src/Gtk2/Preferences.cpp	2006-09-03 20:45:09.000000000 +0100
     87 +++ dasher-4.2.0/Src/Gtk2/Preferences.cpp	2006-10-10 12:00:53.286106000 +0100
     88 @@ -1151,6 +1151,7 @@
     89  
     90  extern "C" gboolean show_helper_window(GtkWidget *pWidget, gpointer *pUserData) {
     91    gtk_window_present(GTK_WINDOW(*pUserData));
     92 +  return TRUE;
     93  }
     94  
     95  extern "C" gboolean advanced_preferences_show(GtkWidget *widget, gpointer user_data) {
     96