From 777ac6fd50b407e9be0fa7dda3e68472c17a7236 Mon Sep 17 00:00:00 2001
From: Alex Duggan <aldug@astrolinux.com>
Date: Wed, 7 Jan 2004 18:08:24 +0000
Subject: [PATCH] Remove #define _(s) and replaced with #include <glib/gi18n.h>
 which fixes

2004-01-07  Alex Duggan  <aldug@astrolinux.com>

	* theme-method.c:
	Remove #define _(s) and replaced with #include <glib/gi18n.h>
	which fixes bug #130757.  Add a function prototype
	(copied from font-method.c) to fix compiler warning.

	* themus-properties-view.c:
	Remove unused variable to fix compiler warning.
---
 vfs-methods/themus/ChangeLog                | 10 ++++++++++
 vfs-methods/themus/theme-method.c           |  7 ++++++-
 vfs-methods/themus/themus-properties-view.c |  2 --
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog
index a7867d9e6..e2aa4151f 100644
--- a/vfs-methods/themus/ChangeLog
+++ b/vfs-methods/themus/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-07  Alex Duggan  <aldug@astrolinux.com>
+
+	* theme-method.c: 
+	Remove #define _(s) and replaced with #include <glib/gi18n.h> 
+	which fixes bug #130757.  Add a function prototype 
+	(copied from font-method.c) to fix compiler warning.
+	
+	* themus-properties-view.c:
+	Remove unused variable to fix compiler warning.
+
 2004-01-02  Andrew Sobala  <aes@gnome.org>
 
 	* Makefile.am:
diff --git a/vfs-methods/themus/theme-method.c b/vfs-methods/themus/theme-method.c
index 78c6a9817..7fe942de6 100644
--- a/vfs-methods/themus/theme-method.c
+++ b/vfs-methods/themus/theme-method.c
@@ -22,6 +22,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-cancellable-ops.h>
 #include <libgnomevfs/gnome-vfs-module.h>
@@ -29,7 +30,11 @@
 #include <gnome-theme-info.h>
 
 #define THEME_METHOD_DIRECTORY DIRECTORY_DIR "/theme-method.directory"
-#define _(s) gettext (s)
+
+/* this is from gnome-vfs-monitor-private.h */
+void gnome_vfs_monitor_callback (GnomeVFSMethodHandle *method_handle,
+                                 GnomeVFSURI *info_uri,
+                                 GnomeVFSMonitorEventType event_type);
 
 static void invoke_monitors(gchar *uri, gpointer data);
 
diff --git a/vfs-methods/themus/themus-properties-view.c b/vfs-methods/themus/themus-properties-view.c
index c978f32c7..6c2386ccd 100644
--- a/vfs-methods/themus/themus-properties-view.c
+++ b/vfs-methods/themus/themus-properties-view.c
@@ -144,8 +144,6 @@ static void
 do_table_attach (GtkWidget *table, GtkWidget *child, guint x, guint y, guint w, guint h,
 guint xalign)
 {
-	GtkWidget *align;
-	
 	gtk_misc_set_alignment (GTK_MISC (child), xalign, 0.5);
 	gtk_table_attach (GTK_TABLE (table), child, x, x + w, y, y + h, GTK_FILL, 0, 6, 6);
 }