You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
264 lines
7.1 KiB
264 lines
7.1 KiB
From 9093e083aa78aee6b85345e8fd15424549d01cac Mon Sep 17 00:00:00 2001
|
|
From: Lianbo Jiang <lijiang@redhat.com>
|
|
Date: Thu, 3 Dec 2020 10:58:33 +0800
|
|
Subject: [PATCH] cleanup: remove unused support.c/support.h generated by Glade
|
|
|
|
The support.c and support.h are automatically generated by Glade, and these
|
|
files are not used any more, so let's remove the redundant files and make a
|
|
cleanup, which can also make ninja-build happy.
|
|
|
|
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
---
|
|
src/gui/callbacks.c | 1 -
|
|
src/gui/engine.cc | 5 --
|
|
src/gui/gtk-lshw.c | 1 -
|
|
src/gui/support.c | 144 --------------------------------------------
|
|
src/gui/support.h | 44 --------------
|
|
5 files changed, 195 deletions(-)
|
|
delete mode 100644 src/gui/support.c
|
|
delete mode 100644 src/gui/support.h
|
|
|
|
diff --git a/src/gui/callbacks.c b/src/gui/callbacks.c
|
|
index b108777fe11f..6b88c82e6098 100644
|
|
--- a/src/gui/callbacks.c
|
|
+++ b/src/gui/callbacks.c
|
|
@@ -5,7 +5,6 @@
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "callbacks.h"
|
|
-#include "support.h"
|
|
#include "version.h"
|
|
#include "engine.h"
|
|
#include <string.h>
|
|
diff --git a/src/gui/engine.cc b/src/gui/engine.cc
|
|
index 2962ec80d81a..b537ef11db23 100644
|
|
--- a/src/gui/engine.cc
|
|
+++ b/src/gui/engine.cc
|
|
@@ -15,11 +15,6 @@
|
|
|
|
static const char *id = "@(#) $Id$";
|
|
|
|
-extern "C"
|
|
-{
|
|
-#include "support.h"
|
|
-};
|
|
-
|
|
#define AUTOMATIC "automatic file format"
|
|
#define LSHW_XML "lshw XML format (.lshw, .xml)"
|
|
#define PLAIN_TEXT "plain text document (.text, .txt)"
|
|
diff --git a/src/gui/gtk-lshw.c b/src/gui/gtk-lshw.c
|
|
index d3e531c4ceb3..090484317c6e 100644
|
|
--- a/src/gui/gtk-lshw.c
|
|
+++ b/src/gui/gtk-lshw.c
|
|
@@ -2,7 +2,6 @@
|
|
#include <unistd.h>
|
|
#include <gtk/gtk.h>
|
|
|
|
-#include "support.h"
|
|
#include "config.h"
|
|
#include "stock.h"
|
|
#include "engine.h"
|
|
diff --git a/src/gui/support.c b/src/gui/support.c
|
|
deleted file mode 100644
|
|
index 7dc3c78cb605..000000000000
|
|
--- a/src/gui/support.c
|
|
+++ /dev/null
|
|
@@ -1,144 +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 <gtk/gtk.h>
|
|
-
|
|
-#include "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;
|
|
-}
|
|
-
|
|
-static GList *pixmaps_directories = NULL;
|
|
-
|
|
-/* Use this function to set the directory containing installed pixmaps. */
|
|
-void
|
|
-add_pixmap_directory (const gchar *directory)
|
|
-{
|
|
- pixmaps_directories = g_list_prepend (pixmaps_directories,
|
|
- g_strdup (directory));
|
|
-}
|
|
-
|
|
-/* This is an internally used function to find pixmap files. */
|
|
-static gchar*
|
|
-find_pixmap_file (const gchar *filename)
|
|
-{
|
|
- GList *elem;
|
|
-
|
|
- /* We step through each of the pixmaps directory to find it. */
|
|
- elem = pixmaps_directories;
|
|
- while (elem)
|
|
- {
|
|
- gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data,
|
|
- G_DIR_SEPARATOR_S, filename);
|
|
- if (g_file_test (pathname, G_FILE_TEST_EXISTS))
|
|
- return pathname;
|
|
- g_free (pathname);
|
|
- elem = elem->next;
|
|
- }
|
|
- return NULL;
|
|
-}
|
|
-
|
|
-/* This is an internally used function to create pixmaps. */
|
|
-GtkWidget*
|
|
-create_pixmap (GtkWidget *widget,
|
|
- const gchar *filename)
|
|
-{
|
|
- gchar *pathname = NULL;
|
|
- GtkWidget *pixmap;
|
|
-
|
|
- if (!filename || !filename[0])
|
|
- return gtk_image_new ();
|
|
-
|
|
- pathname = find_pixmap_file (filename);
|
|
-
|
|
- 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 = find_pixmap_file (filename);
|
|
-
|
|
- 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/gui/support.h b/src/gui/support.h
|
|
deleted file mode 100644
|
|
index 2dea079c2a42..000000000000
|
|
--- a/src/gui/support.h
|
|
+++ /dev/null
|
|
@@ -1,44 +0,0 @@
|
|
-/*
|
|
- * DO NOT EDIT THIS FILE - it is generated by Glade.
|
|
- */
|
|
-
|
|
-#ifdef HAVE_CONFIG_H
|
|
-# include <config.h>
|
|
-#endif
|
|
-
|
|
-#include <gtk/gtk.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);
|
|
-
|
|
-
|
|
-/* Use this function to set the directory containing installed pixmaps. */
|
|
-void add_pixmap_directory (const gchar *directory);
|
|
-
|
|
-
|
|
-/*
|
|
- * 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);
|
|
-
|
|
--
|
|
2.17.1
|
|
|