X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fqueryimmodules.c;h=f4e561de449d94e7dec7153d3aae49662a0960e5;hb=d97861bd8b338c3d25d7ffb5496edee9eee9bfbb;hp=f8fd501192440baedda054715396e9e14e7391e1;hpb=735bee47bea44979d7ee9b293d40a1bde38248a0;p=~andy%2Fgtk

diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index f8fd50119..f4e561de4 100644
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -14,16 +14,13 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <gmodule.h>
 
 #include <errno.h>
 #include <string.h>
@@ -37,10 +34,13 @@
 #define SOEXT ("." G_MODULE_SUFFIX)
 #endif
 
-#include "gtk/gtkrc.h"
-#include "gtk/gtkimmodule.h"
+#include "gtk/gtkimcontextinfo.h"
 #include "gtk/gtkversion.h"
 
+#define GDK_DISABLE_DEPRECATION_WARNINGS
+
+#include "gtk/deprecated/gtkrc.h"
+
 static void
 escape_string (GString *contents, const char *str)
 {
@@ -88,9 +88,6 @@ query_module (const char *dir, const char *name, GString *contents)
 {
   void          (*list)   (const GtkIMContextInfo ***contexts,
                            guint                    *n_contexts);
-  void          (*init)   (GTypeModule              *type_module);
-  void          (*exit)   (void);
-  GtkIMContext *(*create) (const gchar             *context_id);
 
   gpointer list_ptr;
   gpointer init_ptr;
@@ -125,9 +122,6 @@ query_module (const char *dir, const char *name, GString *contents)
       int i;
 
       list = list_ptr;
-      init = init_ptr;
-      exit = exit_ptr;
-      create = create_ptr;
 
       print_escaped (contents, path);
       g_string_append_c (contents, '\n');