gnome-terminal r2939 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Jun 28 23:31:42 2008
New Revision: 2939
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2939&view=rev

Log:
64bit fixes. Bug #540692.

Modified:
   trunk/src/terminal-profile.c
   trunk/src/terminal-profile.h
   trunk/src/terminal-util.c

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Sat Jun 28 23:31:42 2008
@@ -1481,7 +1481,7 @@
   return g_value_get_double (value);
 }
 
-glong
+int
 terminal_profile_get_property_enum (TerminalProfile *profile,
                                     const char *prop_name)
 {

Modified: trunk/src/terminal-profile.h
==============================================================================
--- trunk/src/terminal-profile.h	(original)
+++ trunk/src/terminal-profile.h	Sat Jun 28 23:31:42 2008
@@ -154,7 +154,7 @@
 double            terminal_profile_get_property_double    (TerminalProfile *profile,
                                                            const char *prop_name);
 
-glong             terminal_profile_get_property_enum      (TerminalProfile *profile,
+int               terminal_profile_get_property_enum      (TerminalProfile *profile,
                                                            const char *prop_name);
 
 int               terminal_profile_get_property_int       (TerminalProfile *profile,

Modified: trunk/src/terminal-util.c
==============================================================================
--- trunk/src/terminal-util.c	(original)
+++ trunk/src/terminal-util.c	Sat Jun 28 23:31:42 2008
@@ -346,7 +346,7 @@
 
   if (GTK_IS_RADIO_BUTTON (widget))
     {
-      glong ovalue, rvalue;
+      int ovalue, rvalue;
 
       g_object_get (object, object_prop, &ovalue, NULL);
       rvalue = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "enum-value"));
@@ -377,7 +377,7 @@
     }
   else if (GTK_IS_COMBO_BOX (widget))
     {
-      glong value;
+      int value;
 
       g_object_get (object, object_prop, &value, NULL);
       gtk_combo_box_set_active (GTK_COMBO_BOX (widget), value);
@@ -448,7 +448,7 @@
   if (GTK_IS_RADIO_BUTTON (widget))
     {
       gboolean active;
-      glong value;
+      int value;
 
       active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
       if (!active)
@@ -483,7 +483,7 @@
       int value;
 
       value = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-      g_object_set (object, object_prop, (glong) value, NULL);
+      g_object_set (object, object_prop, value, NULL);
     }
   else if (GTK_IS_COLOR_BUTTON (widget))
     {