seahorse r2222 - in seahorse-plugins/trunk: . agent libseahorse plugins/nautilus

[asaleem svn gnome org]

Author: asaleem
Date: Fri May 30 03:09:16 2008
New Revision: 2222
URL: http://svn.gnome.org/viewvc/seahorse?rev=2222&view=rev

Log:
fix building with G_DISABLE_DEPRECATED

Modified:
   seahorse-plugins/trunk/ChangeLog
   seahorse-plugins/trunk/agent/seahorse-agent-actions.c
   seahorse-plugins/trunk/agent/seahorse-agent-cache.c
   seahorse-plugins/trunk/agent/seahorse-agent-io.c
   seahorse-plugins/trunk/configure.in
   seahorse-plugins/trunk/libseahorse/seahorse-util.c
   seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c

Modified: seahorse-plugins/trunk/agent/seahorse-agent-actions.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-actions.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-actions.c	Fri May 30 03:09:16 2008
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#undef G_DISABLE_DEPRECATED
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>

Modified: seahorse-plugins/trunk/agent/seahorse-agent-cache.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-cache.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-cache.c	Fri May 30 03:09:16 2008
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#undef G_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <sys/types.h>
 #include <stdlib.h>

Modified: seahorse-plugins/trunk/agent/seahorse-agent-io.c
==============================================================================
--- seahorse-plugins/trunk/agent/seahorse-agent-io.c	(original)
+++ seahorse-plugins/trunk/agent/seahorse-agent-io.c	Fri May 30 03:09:16 2008
@@ -19,6 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#undef G_DISABLE_DEPRECATED
+
 #include "config.h"
 #include <sys/param.h>
 #include <sys/socket.h>

Modified: seahorse-plugins/trunk/configure.in
==============================================================================
--- seahorse-plugins/trunk/configure.in	(original)
+++ seahorse-plugins/trunk/configure.in	Fri May 30 03:09:16 2008
@@ -590,7 +590,7 @@
 	    [Compile binaries in debug mode]))
 
 if test "$enable_debug" = "yes"; then
-  CFLAGS="$CFLAGS -g -O0 -DBONOBO_DISABLE_DEPRECATED -DDISABLE_DEPRECATED -Wall -Werror"
+  CFLAGS="$CFLAGS -g -O0 -DBONOBO_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -Wall -Werror"
   AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode])
   echo "enabling debug compile mode"
 else 

Modified: seahorse-plugins/trunk/libseahorse/seahorse-util.c
==============================================================================
--- seahorse-plugins/trunk/libseahorse/seahorse-util.c	(original)
+++ seahorse-plugins/trunk/libseahorse/seahorse-util.c	Fri May 30 03:09:16 2008
@@ -188,7 +188,7 @@
 		return "0";
 	
 	created_date = g_date_new ();
-	g_date_set_time (created_date, time);
+	g_date_set_time_t (created_date, time);
 	created_string = g_new (gchar, 11);
 	g_date_strftime (created_string, 11, "%Y-%m-%d", created_date);
 	return created_string;
@@ -212,7 +212,7 @@
 		return "0";
 	
 	created_date = g_date_new ();
-	g_date_set_time (created_date, time);
+	g_date_set_time_t (created_date, time);
 	created_string = g_new (gchar, 11);
 	g_date_strftime (created_string, 11, _("%Y-%m-%d"), created_date);
 	return created_string;

Modified: seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c
==============================================================================
--- seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c	(original)
+++ seahorse-plugins/trunk/plugins/nautilus/seahorse-tool-progress.c	Fri May 30 03:09:16 2008
@@ -80,15 +80,15 @@
     if (!args[0])
         g_warning ("invalid progress line");
     
-    else if (g_strcasecmp (args[0], CMD_BLOCK) == 0)
+    else if (g_ascii_strcasecmp (args[0], CMD_BLOCK) == 0)
         progress_block = TRUE;
     
-    else if (g_strcasecmp (args[0], CMD_UNBLOCK) == 0) {
+    else if (g_ascii_strcasecmp (args[0], CMD_UNBLOCK) == 0) {
         progress_block = FALSE;
         g_timeout_add (PROGRESS_DELAY, (GSourceFunc)progress_show, op);
     }
     
-    else if (g_strcasecmp (args[0], CMD_PROGRESS) == 0) {
+    else if (g_ascii_strcasecmp (args[0], CMD_PROGRESS) == 0) {
         
         if (args[1]) {
             fract = strtod (args[1], &e);