[Xfce4-commits] [apps/xfburn] 42/42: Removed the last remnant if gtk+2 stock icons
noreply at xfce.org
noreply at xfce.org
Tue Oct 15 02:22:25 CEST 2019
This is an automated email from the git hooks/post-receive script.
k a t a n a s t e e l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfburn.
commit 989e4792571aba4196271e7239f1dd0652563e36
Author: Rene Kjellerup <rk.katana.steel at gmail.com>
Date: Sun Oct 13 11:16:10 2019 -0700
Removed the last remnant if gtk+2 stock icons
---
xfburn/Makefile.am | 2 -
xfburn/xfburn-audio-disc-usage.c | 1 -
xfburn/xfburn-blank-dialog.c | 1 -
xfburn/xfburn-burn-audio-cd-composition-dialog.c | 1 -
xfburn/xfburn-burn-data-cd-composition-dialog.c | 1 -
xfburn/xfburn-burn-data-composition-base-dialog.c | 1 -
xfburn/xfburn-burn-data-dvd-composition-dialog.c | 1 -
xfburn/xfburn-burn-image-dialog.c | 1 -
xfburn/xfburn-copy-cd-dialog.c | 1 -
xfburn/xfburn-copy-dvd-dialog.c | 1 -
xfburn/xfburn-data-disc-usage.c | 1 -
xfburn/xfburn-disc-usage.c | 1 -
xfburn/xfburn-main-window.c | 1 -
xfburn/xfburn-main.c | 2 -
xfburn/xfburn-stock.c | 80 -----------------------
xfburn/xfburn-stock.h | 39 -----------
xfburn/xfburn-welcome-tab.c | 1 -
17 files changed, 136 deletions(-)
diff --git a/xfburn/Makefile.am b/xfburn/Makefile.am
index 0eee23b..e82a44a 100644
--- a/xfburn/Makefile.am
+++ b/xfburn/Makefile.am
@@ -46,7 +46,6 @@ xfburn_headers = \
xfburn-directory-browser.h \
xfburn-preferences-dialog.h \
xfburn-cclosure-marshal.h \
- xfburn-stock.h \
xfburn-utils.h \
xfburn-main.h
@@ -88,7 +87,6 @@ xfburn_SOURCES = \
xfburn-directory-browser.c \
xfburn-preferences-dialog.c \
xfburn-cclosure-marshal.c \
- xfburn-stock.c \
xfburn-utils.c
xfburn_CFLAGS = \
diff --git a/xfburn/xfburn-audio-disc-usage.c b/xfburn/xfburn-audio-disc-usage.c
index f78ea77..4387cf2 100644
--- a/xfburn/xfburn-audio-disc-usage.c
+++ b/xfburn/xfburn-audio-disc-usage.c
@@ -28,7 +28,6 @@
#include "xfburn-global.h"
#include "xfburn-settings.h"
#include "xfburn-utils.h"
-#include "xfburn-stock.h"
#include "xfburn-main-window.h"
/* prototypes */
diff --git a/xfburn/xfburn-blank-dialog.c b/xfburn/xfburn-blank-dialog.c
index 011db3f..604008a 100644
--- a/xfburn/xfburn-blank-dialog.c
+++ b/xfburn/xfburn-blank-dialog.c
@@ -29,7 +29,6 @@
#include "xfburn-progress-dialog.h"
#include "xfburn-device-box.h"
#include "xfburn-device-list.h"
-#include "xfburn-stock.h"
#include "xfburn-udev-manager.h"
#include "xfburn-main.h"
diff --git a/xfburn/xfburn-burn-audio-cd-composition-dialog.c b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
index 3f4cfc6..5b3c9e2 100644
--- a/xfburn/xfburn-burn-audio-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-audio-cd-composition-dialog.c
@@ -33,7 +33,6 @@
#include "xfburn-global.h"
#include "xfburn-utils.h"
#include "xfburn-settings.h"
-#include "xfburn-stock.h"
#include "xfburn-settings.h"
#include "xfburn-device-box.h"
diff --git a/xfburn/xfburn-burn-data-cd-composition-dialog.c b/xfburn/xfburn-burn-data-cd-composition-dialog.c
index f563095..3b2655d 100644
--- a/xfburn/xfburn-burn-data-cd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-cd-composition-dialog.c
@@ -33,7 +33,6 @@
#include "xfburn-global.h"
#include "xfburn-utils.h"
#include "xfburn-settings.h"
-#include "xfburn-stock.h"
#include "xfburn-burn-data-composition-base-dialog.h"
#include "xfburn-burn-data-cd-composition-dialog.h"
diff --git a/xfburn/xfburn-burn-data-composition-base-dialog.c b/xfburn/xfburn-burn-data-composition-base-dialog.c
index 104039f..de6aa98 100644
--- a/xfburn/xfburn-burn-data-composition-base-dialog.c
+++ b/xfburn/xfburn-burn-data-composition-base-dialog.c
@@ -33,7 +33,6 @@
#include "xfburn-global.h"
#include "xfburn-utils.h"
#include "xfburn-settings.h"
-#include "xfburn-stock.h"
#include "xfburn-settings.h"
#include "xfburn-device-box.h"
diff --git a/xfburn/xfburn-burn-data-dvd-composition-dialog.c b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
index 5aa8069..0df14a1 100644
--- a/xfburn/xfburn-burn-data-dvd-composition-dialog.c
+++ b/xfburn/xfburn-burn-data-dvd-composition-dialog.c
@@ -33,7 +33,6 @@
#include "xfburn-global.h"
#include "xfburn-utils.h"
#include "xfburn-settings.h"
-#include "xfburn-stock.h"
#include "xfburn-device-box.h"
#include "xfburn-burn-data-dvd-composition-dialog.h"
diff --git a/xfburn/xfburn-burn-image-dialog.c b/xfburn/xfburn-burn-image-dialog.c
index 2171e2b..349c165 100644
--- a/xfburn/xfburn-burn-image-dialog.c
+++ b/xfburn/xfburn-burn-image-dialog.c
@@ -33,7 +33,6 @@
#include "xfburn-utils.h"
#include "xfburn-progress-dialog.h"
#include "xfburn-device-box.h"
-#include "xfburn-stock.h"
#include "xfburn-settings.h"
#include "xfburn-main.h"
diff --git a/xfburn/xfburn-copy-cd-dialog.c b/xfburn/xfburn-copy-cd-dialog.c
index a0d2957..4a5fdbc 100644
--- a/xfburn/xfburn-copy-cd-dialog.c
+++ b/xfburn/xfburn-copy-cd-dialog.c
@@ -30,7 +30,6 @@
#include "xfburn-copy-cd-progress-dialog.h"
#include "xfburn-create-iso-progress-dialog.h"
#include "xfburn-device-box.h"
-#include "xfburn-stock.h"
#include "xfburn-copy-cd-dialog.h"
diff --git a/xfburn/xfburn-copy-dvd-dialog.c b/xfburn/xfburn-copy-dvd-dialog.c
index 21f5713..f05bfca 100644
--- a/xfburn/xfburn-copy-dvd-dialog.c
+++ b/xfburn/xfburn-copy-dvd-dialog.c
@@ -30,7 +30,6 @@
#include "xfburn-copy-cd-progress-dialog.h"
#include "xfburn-create-iso-progress-dialog.h"
#include "xfburn-device-box.h"
-#include "xfburn-stock.h"
#include "xfburn-copy-dvd-dialog.h"
diff --git a/xfburn/xfburn-data-disc-usage.c b/xfburn/xfburn-data-disc-usage.c
index c04c924..12bc3e8 100644
--- a/xfburn/xfburn-data-disc-usage.c
+++ b/xfburn/xfburn-data-disc-usage.c
@@ -28,7 +28,6 @@
#include "xfburn-global.h"
#include "xfburn-settings.h"
#include "xfburn-utils.h"
-#include "xfburn-stock.h"
#include "xfburn-main-window.h"
/* prototypes */
diff --git a/xfburn/xfburn-disc-usage.c b/xfburn/xfburn-disc-usage.c
index 0861560..f738521 100644
--- a/xfburn/xfburn-disc-usage.c
+++ b/xfburn/xfburn-disc-usage.c
@@ -36,7 +36,6 @@
#include "xfburn-global.h"
#include "xfburn-settings.h"
#include "xfburn-utils.h"
-#include "xfburn-stock.h"
#include "xfburn-main-window.h"
diff --git a/xfburn/xfburn-main-window.c b/xfburn/xfburn-main-window.c
index d6f3784..202075c 100644
--- a/xfburn/xfburn-main-window.c
+++ b/xfburn/xfburn-main-window.c
@@ -39,7 +39,6 @@
#include "xfburn-progress-dialog.h"
#include "xfburn-settings.h"
#include "xfburn-main.h"
-#include "xfburn-stock.h"
#include "xfburn-utils.h"
#define XFBURN_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), XFBURN_TYPE_MAIN_WINDOW, XfburnMainWindowPrivate))
diff --git a/xfburn/xfburn-main.c b/xfburn/xfburn-main.c
index 2436f86..47369e6 100644
--- a/xfburn/xfburn-main.c
+++ b/xfburn/xfburn-main.c
@@ -40,7 +40,6 @@
#include "xfburn-device-list.h"
#include "xfburn-utils.h"
#include "xfburn-settings.h"
-#include "xfburn-stock.h"
#include "xfburn-burn-image-dialog.h"
#include "xfburn-main-window.h"
#include "xfburn-blank-dialog.h"
@@ -284,7 +283,6 @@ main (int argc, char **argv)
}
#endif
- xfburn_stock_init ();
devlist = xfburn_device_list_new ();
g_object_get (devlist, "num-burners", &n_burners, NULL);
diff --git a/xfburn/xfburn-stock.c b/xfburn/xfburn-stock.c
deleted file mode 100644
index 78cd0f1..0000000
--- a/xfburn/xfburn-stock.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2006 Jean-François Wauthy (pollux at xfce.org)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#include "xfburn-stock.h"
-
-static const gchar *xfburn_stock_icons[] = {
- XFBURN_STOCK_AUDIO_COPY,
- XFBURN_STOCK_BLANK_CDRW,
- XFBURN_STOCK_FORMAT_DVDRW,
- XFBURN_STOCK_AUDIO_CD,
- XFBURN_STOCK_BURN_CD,
- XFBURN_STOCK_CD,
- XFBURN_STOCK_DATA_COPY,
- XFBURN_STOCK_IMPORT_SESSION,
- XFBURN_STOCK_NEW_DATA_COMPOSITION,
- XFBURN_STOCK,
-};
-
-void
-xfburn_stock_init (void)
-{
- GtkIconFactory * icon_factory;
- GtkIconSource *icon_source;
- GtkIconSet *icon_set;
- gchar icon_name[128];
- guint n;
-
- /* allocate a new icon factory for the terminal icons */
- icon_factory = gtk_icon_factory_new ();
-
- memcpy (icon_name, "stock_", sizeof ("stock_"));
-
- /* we try to avoid allocating multiple icon sources */
- icon_source = gtk_icon_source_new ();
-
- /* register our stock icons */
- for (n = 0; n < G_N_ELEMENTS (xfburn_stock_icons); ++n) {
- /* set the new icon name for the icon source */
- strcpy (icon_name + (sizeof ("stock_") - 1), xfburn_stock_icons[n]);
- gtk_icon_source_set_icon_name (icon_source, icon_name);
-
- /* allocate the icon set */
- icon_set = gtk_icon_set_new ();
- gtk_icon_set_add_source (icon_set, icon_source);
- gtk_icon_factory_add (icon_factory, xfburn_stock_icons[n], icon_set);
- gtk_icon_set_unref (icon_set);
- }
-
- /* register the icon factory as default */
- gtk_icon_factory_add_default (icon_factory);
-
- /* cleanup */
- g_object_unref (G_OBJECT (icon_factory));
- gtk_icon_source_free (icon_source);
-}
diff --git a/xfburn/xfburn-stock.h b/xfburn/xfburn-stock.h
deleted file mode 100644
index 002ef95..0000000
--- a/xfburn/xfburn-stock.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006 Jean-François Wauthy (pollux at xfce.org)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __XFBURN_STOCK_H__
-#define __XFBURN_STOCK_H__
-
-G_BEGIN_DECLS;
-
-#define XFBURN_STOCK_AUDIO_COPY "xfburn-audio-copy"
-#define XFBURN_STOCK_BLANK_CDRW "xfburn-blank-cdrw"
-#define XFBURN_STOCK_FORMAT_DVDRW "xfburn-format-dvdrw"
-#define XFBURN_STOCK_AUDIO_CD "xfburn-audio-cd"
-#define XFBURN_STOCK_BURN_CD "xfburn"
-#define XFBURN_STOCK_CD "xfburn-cd"
-#define XFBURN_STOCK_DATA_COPY "xfburn-data-copy"
-#define XFBURN_STOCK_IMPORT_SESSION "xfburn-import-session"
-#define XFBURN_STOCK_NEW_DATA_COMPOSITION "xfburn-new-data-composition"
-#define XFBURN_STOCK "xfburn"
-
-void xfburn_stock_init (void);
-
-G_END_DECLS;
-
-#endif
diff --git a/xfburn/xfburn-welcome-tab.c b/xfburn/xfburn-welcome-tab.c
index 89ab120..362d1d9 100644
--- a/xfburn/xfburn-welcome-tab.c
+++ b/xfburn/xfburn-welcome-tab.c
@@ -32,7 +32,6 @@
#include "xfburn-welcome-tab.h"
-#include "xfburn-stock.h"
#include "xfburn-main-window.h"
#include "xfburn-compositions-notebook.h"
#include "xfburn-burn-image-dialog.h"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list