[SCM] Rasmol packaging branch, master, updated. debian/2.7.4.2-5-34-g3fc03e3

[Teemu Ikonen]

The following commit has been merged in the master branch:
commit fe9eb9de3a06a8780d29c6e41496aa021f51176d
Author: Teemu Ikonen <tpikonen at gmail.com>
Date:   Mon Dec 13 18:12:05 2010 +0100

    Replace int with uintptr_t when casting pointers to ints in GTK callbacks.

diff --git a/src/gtkwin.c b/src/gtkwin.c
index 37582d0..014d269 100755
--- a/src/gtkwin.c
+++ b/src/gtkwin.c
@@ -155,7 +155,7 @@ enum {
 	RES_150,
 	RES_300
 };
-int print_resolution = RES_CURRENT;
+uintptr_t print_resolution = RES_CURRENT;
 GtkPrintSettings *print_settings = NULL;
 GtkPageSetup *print_pagesetup = NULL;
 
@@ -457,11 +457,9 @@ gboolean sizespin_cb(GtkSpinButton button, gpointer data)
 
 gboolean sizeradio_cb(GtkButton * button, gpointer data)
 {
-    int radioid;
     GtkLabel *header = NULL;
     char header_str[128];
-
-    radioid = (int) data;
+    uintptr_t radioid = (uintptr_t) data;
 
     export_x = XRange;
     export_y = YRange;
@@ -750,7 +748,7 @@ void print_get_res_cb(GtkPrintOperation * print, GtkWidget * widget,
     while (el != NULL) {
         if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(el->data))) {
             print_resolution =
-                (int) g_object_get_data(G_OBJECT(el->data), "res");
+                (uintptr_t) g_object_get_data(G_OBJECT(el->data), "res");
             return;
         } else
             el = el->next;

-- 
Rasmol packaging