Merge pull request #22 from infirit/1.6

Cherrypick usefull commits from master

4 files changed, 4 insertions, 48 deletions

diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index bdce6d7..0000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=mate-calc
-pkgver=1.4
-pkgrel=1
-pkgdesc="Calculator for the Mate desktop environment"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL')
-depends=('gtk2' 'libxml2' 'libpng' 'freetype2' 'pixman' 'pango' 'gdk-pixbuf2' 'cairo' 'atk')
-makedepends=('pkgconfig' 'mate-doc-utils')
-groups=('mate-extra')
-url="http://mate-desktop.org/"
-source=()
-sha256sums=()
-install=mate-calc.install
-
-build() {
-  cd "${srcdir}/../../../"
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/../../../"
-  make DESTDIR="${pkgdir}" install || return 1
-}
-
diff --git a/distro/archlinux/mate-calc.install b/distro/archlinux/mate-calc.install
deleted file mode 100644
index 20b564d..0000000
--- a/distro/archlinux/mate-calc.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=mate-calc
-
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/src/math-display.c b/src/math-display.c
index fb5af8b..dcc8db7 100644
--- a/src/math-display.c
+++ b/src/math-display.c
@@ -69,6 +69,9 @@ display_key_press_cb(GtkWidget *widget, GdkEventKey *event, MathDisplay *display
     /* Treat keypad keys as numbers even when numlock is off */
     switch(event->keyval)
     {
+    case GDK_KEY_KP_Delete: /* Period without numlock */
+        new_keyval = GDK_KEY_KP_Decimal;
+        break;
     case GDK_KEY_KP_Insert:
         new_keyval = GDK_KEY_0;
         break;
diff --git a/src/math-window.c b/src/math-window.c
index 8a9302d..8f152b3 100644
--- a/src/math-window.c
+++ b/src/math-window.c
@@ -222,7 +222,7 @@ static void help_cb(GtkWidget *widget, MathWindow *window)
         d = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(d), "%s", error->message);
-        g_signal_connect(d, "respones", G_CALLBACK(gtk_widget_destroy), NULL);
+        g_signal_connect(d, "response", G_CALLBACK(gtk_widget_destroy), NULL);
         gtk_window_present(GTK_WINDOW (d));
 
         g_error_free(error);