head	1.2;
access;
symbols
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_HEAD:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.11.30.16.01.23;	author rse;	state Exp;
branches;
next	1.1;
commitid	8HDxjqTDPlU7eCHs;

1.1
date	2006.11.15.20.34.19;	author rse;	state Exp;
branches;
next	;
commitid	PHabBcaxgYI3XNUr;


desc
@@


1.2
log
@upgrading package: pinentry 0.7.3 -> 0.7.4
@
text
@Index: gtk+-2/gtksecentry.c
--- gtk+-2/gtksecentry.c.orig	2004-09-02 03:47:13 +0200
+++ gtk+-2/gtksecentry.c	2006-11-15 21:27:51 +0100
@@@@ -39,6 +39,16 @@@@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#define g_malloc my_g_malloc
+#define g_malloc0 my_g_malloc0
+#define g_realloc my_g_realloc
+#define g_free my_g_free
+
+gpointer g_malloc(gulong size);
+gpointer g_malloc0(gulong size);
+gpointer g_realloc(gpointer mem, gulong size);
+void g_free(gpointer mem);
+
 #include "gtksecentry.h"
 #include "memory.h"
 
@


1.1
log
@new package: pinentry 0.7.2 (Interactive PIN Entry Dialogs)
@
text
@a20 15
@@@@ -3210,11 +3220,11 @@@@
 get_cursor_time(GtkSecureEntry * entry)
 {
     GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(entry));
-    gint time;
+    gint _time;
 
-    g_object_get(settings, "gtk-cursor-blink-time", &time, NULL);
+    g_object_get(settings, "gtk-cursor-blink-time", &_time, NULL);
 
-    return time;
+    return _time;
 }
 
 static void
@