'src/install/acquire/ui-gnome-support.[ch]' are left autogenerated by Glade.

diff --git a/autogen.pl b/autogen.pl
index cb3e53d..0b71494 100755 (executable)
--- a/autogen.pl
+++ b/autogen.pl
@@ -51,6 +51,7 @@ AutoGen->run(
                                ./src/install/acquire/captive-install-acquire
                                ./src/install/acquire/ui-gnome-callbacks.[ch]
                                ./src/install/acquire/ui-gnome-interface.[ch]
+                               ./src/install/acquire/ui-gnome-support.[ch]
                                ./src/install/acquire/ui-gnome.glade.bak
                                ./src/install/acquire/ui-gnome.gladep.bak
                                ./src/libcaptive/cc/marshallers.[ch]

diff --git a/src/install/acquire/Makefile.am b/src/install/acquire/Makefile.am
index 8051567..2d58184 100644 (file)
--- a/src/install/acquire/Makefile.am
+++ b/src/install/acquire/Makefile.am
@@ -25,7 +25,9 @@ GLADE_IN= \
 GLADE_OUT= \
                ui-gnome-interface.c \
                ui-gnome-interface.h \
-               ui-gnome-callbacks.h
+               ui-gnome-callbacks.h \
+               ui-gnome-support.c \
+               ui-gnome-support.h
 
 captive_install_acquire_SOURCES= \
                cabextract/cabextract.c \
@@ -48,8 +50,6 @@ captive_install_acquire_SOURCES= \
                ui-line.h \
                ui-gnome.c \
                ui-gnome.h \
-               ui-gnome-support.c \
-               ui-gnome-support.h \
                $(GLADE_OUT)
 
 EXTRA_DIST+= \

diff --git a/src/install/acquire/ui-gnome-support.c b/src/install/acquire/ui-gnome-support.c
deleted file mode 100644 (file)
index 68576d2..0000000
--- a/src/install/acquire/ui-gnome-support.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <gnome.h>
-
-#include "ui-gnome-support.h"
-
-GtkWidget*
-lookup_widget                          (GtkWidget       *widget,
-                                        const gchar     *widget_name)
-{
-  GtkWidget *parent, *found_widget;
-
-  for (;;)
-    {
-      if (GTK_IS_MENU (widget))
-        parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
-      else
-        parent = widget->parent;
-      if (!parent)
-        parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
-      if (parent == NULL)
-        break;
-      widget = parent;
-    }
-
-  found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget),
-                                                 widget_name);
-  if (!found_widget)
-    g_warning ("Widget not found: %s", widget_name);
-  return found_widget;
-}
-
-/* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap                          (GtkWidget       *widget,
-                                        const gchar     *filename)
-{
-  GtkWidget *pixmap;
-  gchar *pathname;
-
-  if (!filename || !filename[0])
-      return gtk_image_new ();
-
-  pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
-                                        filename, TRUE, NULL);
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return gtk_image_new ();
-    }
-
-  pixmap = gtk_image_new_from_file (pathname);
-  g_free (pathname);
-  return pixmap;
-}
-
-/* This is an internally used function to create pixmaps. */
-GdkPixbuf*
-create_pixbuf                          (const gchar     *filename)
-{
-  gchar *pathname = NULL;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (!filename || !filename[0])
-      return NULL;
-
-  pathname = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP,
-                                        filename, TRUE, NULL);
-
-  if (!pathname)
-    {
-      g_warning (_("Couldn't find pixmap file: %s"), filename);
-      return NULL;
-    }
-
-  pixbuf = gdk_pixbuf_new_from_file (pathname, &error);
-  if (!pixbuf)
-    {
-      fprintf (stderr, "Failed to load pixbuf file: %s: %s\n",
-               pathname, error->message);
-      g_error_free (error);
-    }
-  g_free (pathname);
-  return pixbuf;
-}
-
-/* This is used to set ATK action descriptions. */
-void
-glade_set_atk_action_description       (AtkAction       *action,
-                                        const gchar     *action_name,
-                                        const gchar     *description)
-{
-  gint n_actions, i;
-
-  n_actions = atk_action_get_n_actions (action);
-  for (i = 0; i < n_actions; i++)
-    {
-      if (!strcmp (atk_action_get_name (action, i), action_name))
-        atk_action_set_description (action, i, description);
-    }
-}
-

diff --git a/src/install/acquire/ui-gnome-support.h b/src/install/acquire/ui-gnome-support.h
deleted file mode 100644 (file)
index 13d1746..0000000
--- a/src/install/acquire/ui-gnome-support.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
- */
-
-#include <gnome.h>
-
-/*
- * Public Functions.
- */
-
-/*
- * This function returns a widget in a component created by Glade.
- * Call it with the toplevel widget in the component (i.e. a window/dialog),
- * or alternatively any widget in the component, and the name of the widget
- * you want returned.
- */
-GtkWidget*  lookup_widget              (GtkWidget       *widget,
-                                        const gchar     *widget_name);
-
-
-
-/*
- * Private Functions.
- */
-
-/* This is used to create the pixmaps used in the interface. */
-GtkWidget*  create_pixmap              (GtkWidget       *widget,
-                                        const gchar     *filename);
-
-/* This is used to create the pixbufs used in the interface. */
-GdkPixbuf*  create_pixbuf              (const gchar     *filename);
-
-/* This is used to set ATK action descriptions. */
-void        glade_set_atk_action_description (AtkAction       *action,
-                                              const gchar     *action_name,
-                                              const gchar     *description);
-