[PATCH 2/3] Fix G_DISABLE_DEPRECATED in configure.in
- From: Saleem Abdulrasool <compnerd compnerd org>
- To: seahorse-list gnome org
- Subject: [PATCH 2/3] Fix G_DISABLE_DEPRECATED in configure.in
- Date: Wed, 28 May 2008 19:57:30 -0700
Minor fixes for the fallout from the use of G_DISABLE_DEPRECATED. Use #undef
G_DISABLE_DEPRECATED in the agent to allow the usage of GMemChunk.
Signed-off-by: Saleem Abdulrasool <compnerd compnerd org>
---
agent/seahorse-agent-actions.c | 2 ++
agent/seahorse-agent-cache.c | 2 ++
agent/seahorse-agent-io.c | 2 ++
configure.in | 2 +-
libseahorse/seahorse-util.c | 4 ++--
plugins/nautilus/seahorse-tool-progress.c | 6 +++---
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/agent/seahorse-agent-actions.c b/agent/seahorse-agent-actions.c
index 82f5150..a572058 100644
--- a/agent/seahorse-agent-actions.c
+++ b/agent/seahorse-agent-actions.c
@@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
+#undef G_DISABLE_DEPRECATED
+
#include <sys/types.h>
#include <stdlib.h>
#include <string.h>
diff --git a/agent/seahorse-agent-cache.c b/agent/seahorse-agent-cache.c
index 62a3058..ceb01cf 100644
--- a/agent/seahorse-agent-cache.c
+++ b/agent/seahorse-agent-cache.c
@@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
+#undef G_DISABLE_DEPRECATED
+
#include "config.h"
#include <sys/types.h>
#include <stdlib.h>
diff --git a/agent/seahorse-agent-io.c b/agent/seahorse-agent-io.c
index 68926f1..ce229b4 100644
--- a/agent/seahorse-agent-io.c
+++ b/agent/seahorse-agent-io.c
@@ -19,6 +19,8 @@
* Boston, MA 02111-1307, USA.
*/
+#undef G_DISABLE_DEPRECATED
+
#include "config.h"
#include <sys/param.h>
#include <sys/socket.h>
diff --git a/configure.in b/configure.in
index 0ff999b..ad5e485 100644
--- a/configure.in
+++ b/configure.in
@@ -590,7 +590,7 @@ AC_ARG_ENABLE(debug,
[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
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index da27531..55c8fa9 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -188,7 +188,7 @@ seahorse_util_get_date_string (const time_t time)
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 @@ seahorse_util_get_display_date_string (const time_t time)
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;
diff --git a/plugins/nautilus/seahorse-tool-progress.c b/plugins/nautilus/seahorse-tool-progress.c
index e54afc4..9fbfd04 100755
--- a/plugins/nautilus/seahorse-tool-progress.c
+++ b/plugins/nautilus/seahorse-tool-progress.c
@@ -80,15 +80,15 @@ process_line (SeahorseOperation *op, const gchar *line)
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]