common: Remove capplet-stock-icons

author: rbuj <[email protected]> 2019-06-17 10:59:53 +0200
committer: Robert Antoni Buj Gelonch <[email protected]> 2019-06-18 20:40:37 +0200
commit: 51e386fd4f5c60750c57a815203981754580e01d (patch)
tree: d3d4813e5f17ab9fd6c0b9e938b5af51c7a1eb31
parent: 1a8ced9c5e6dd3f5bb2cd36a256f90e94a9f0d4d (diff)
download: mate-control-center-51e386fd4f5c60750c57a815203981754580e01d.tar.bz2
mate-control-center-51e386fd4f5c60750c57a815203981754580e01d.tar.xz
8 files changed, 16 insertions, 190 deletions
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index e9cb41dd..c0e4481c 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -23,8 +23,6 @@ noinst_LTLIBRARIES = libcommon.la
 libcommon_la_SOURCES = \
 activate-settings-daemon.c \
 activate-settings-daemon.h \
- capplet-stock-icons.c \
- capplet-stock-icons.h \
 capplet-util.c \
 capplet-util.h \
 dconf-util.c \
diff --git a/capplets/common/capplet-stock-icons.c b/capplets/common/capplet-stock-icons.c
deleted file mode 100644
index fd138132..00000000
--- a/capplets/common/capplet-stock-icons.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * capplet-stock-icons.c
- *
- * Copyright (C) 2002 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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 Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Authors:
- * Rajkumar Sivasamy <[email protected]>
- * Taken bits of code from panel-stock-icons.c, Thanks Mark <[email protected]>
- */
-
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
-#include "capplet-stock-icons.h"
-
-static GtkIconSize mouse_capplet_dblclck_icon_size = 0;
-
-GtkIconSize
-mouse_capplet_dblclck_icon_get_size (void)
-{
- return mouse_capplet_dblclck_icon_size;
-}
-
-typedef struct
-{
- char *stock_id;
- char *name;
-} CappletStockIcon;
-
-
-static CappletStockIcon items [] = {
- { MOUSE_DBLCLCK_MAYBE, "double-click-maybe.svg"},
- { MOUSE_DBLCLCK_ON, "double-click-on.svg"},
- { MOUSE_DBLCLCK_OFF, "double-click-off.svg"}
-};
-
-static void
-capplet_register_stock_icons (GtkIconFactory *factory)
-{
- gint i;
- GtkIconSource *source;
-
- source = gtk_icon_source_new ();
-
- for (i = 0; i < G_N_ELEMENTS (items); ++i) {
- GtkIconSet *icon_set;
- char *filename;
- filename = g_build_filename (PIXMAP_DIR, items[i].name, NULL);
-
- if (!filename) {
- g_warning (_("Unable to load stock icon '%s'\n"), items[i].name);
- icon_set = gtk_icon_factory_lookup_default ("gtk-missing-image");
- gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
- continue;
- }
-
- gtk_icon_source_set_filename (source, filename);
- g_free (filename);
-
- icon_set = gtk_icon_set_new ();
- gtk_icon_set_add_source (icon_set, source);
- gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
- gtk_icon_set_unref (icon_set);
- }
- gtk_icon_source_free (source);
-}
-
-void
-capplet_init_stock_icons (void)
-{
- GtkIconFactory *factory;
- static gboolean initialized = FALSE;
-
- if (initialized)
- return;
- initialized = TRUE;
-
- factory = gtk_icon_factory_new ();
- gtk_icon_factory_add_default (factory);
- capplet_register_stock_icons (factory);
-
- mouse_capplet_dblclck_icon_size = gtk_icon_size_register ("mouse-capplet-dblclck-icon",
- MOUSE_CAPPLET_DBLCLCK_ICON_SIZE,
- MOUSE_CAPPLET_DBLCLCK_ICON_SIZE);
- g_object_unref (factory);
-}
diff --git a/capplets/common/capplet-stock-icons.h b/capplets/common/capplet-stock-icons.h
deleted file mode 100644
index 51f74d29..00000000
--- a/capplets/common/capplet-stock-icons.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * capplet-stock-icons.h
- *
- * Copyright (C) 2002 Sun Microsystems, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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 Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Authors:
- * Rajkumar Sivasamy <[email protected]>
- * Taken bits of code from panel-stock-icons.h, Thanks Mark <[email protected]>
- */
-
-#ifndef __CAPPLET_STOCK_ICONS_H__
-#define __CAPPLET_STOCK_ICONS_H__
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define KEYBOARD_CAPPLET_DEFAULT_ICON_SIZE 48
-#define MOUSE_CAPPLET_DEFAULT_WIDTH 120
-#define MOUSE_CAPPLET_DEFAULT_HEIGHT 100
-#define MOUSE_CAPPLET_DBLCLCK_ICON_SIZE 100
-
-/* stock icons */
-#define KEYBOARD_REPEAT "keyboard-repeat"
-#define KEYBOARD_CURSOR "keyboard-cursor"
-#define KEYBOARD_VOLUME "keyboard-volume"
-#define KEYBOARD_BELL "keyboard-bell"
-#define ACCESSX_KEYBOARD_BOUNCE "accessibility-keyboard-bouncekey"
-#define ACCESSX_KEYBOARD_SLOW "accessibility-keyboard-slowkey"
-#define ACCESSX_KEYBOARD_MOUSE "accessibility-keyboard-mousekey"
-#define ACCESSX_KEYBOARD_STICK "accessibility-keyboard-stickykey"
-#define ACCESSX_KEYBOARD_TOGGLE "accessibility-keyboard-togglekey"
-#define MOUSE_DBLCLCK_MAYBE "mouse-dblclck-maybe"
-#define MOUSE_DBLCLCK_ON "mouse-dblclck-on"
-#define MOUSE_DBLCLCK_OFF "mouse-dblclck-off"
-#define MOUSE_RIGHT_HANDED "mouse-right-handed"
-#define MOUSE_LEFT_HANDED "mouse-left-handed"
-
-void capplet_init_stock_icons (void);
-GtkIconSize keyboard_capplet_icon_get_size (void);
-GtkIconSize mouse_capplet_icon_get_size (void);
-GtkIconSize mouse_capplet_dblclck_icon_get_size (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CAPPLET_STOCK_ICONS_H__ */
diff --git a/capplets/keyboard/mate-keyboard-properties.c b/capplets/keyboard/mate-keyboard-properties.c
index a5da8f0d..b9bd4d45 100644
--- a/capplets/keyboard/mate-keyboard-properties.c
+++ b/capplets/keyboard/mate-keyboard-properties.c
@@ -33,7 +33,6 @@
 
 #include "capplet-util.h"
 #include "activate-settings-daemon.h"
-#include "capplet-stock-icons.h"
 
 #include "mate-keyboard-properties-a11y.h"
 #include "mate-keyboard-properties-xkb.h"
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 607979a7..3a306933 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -16,12 +16,6 @@ mate_mouse_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir = $(pkgdatadir)/pixmaps
-pixmap_DATA = \
- double-click-on.svg \
- double-click-off.svg \
- double-click-maybe.svg
-
 include $(top_srcdir)/gla11y.mk
 
 desktopdir = $(datadir)/applications
@@ -36,6 +30,13 @@ AM_CPPFLAGS = \
 -DMATELOCALEDIR="\"$(datadir)/locale\"" \
 -DMATECC_DATA_DIR="\"$(pkgdatadir)\""
 CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(BUILT_SOURCES) $(GLA11Y_OUTPUT)
-EXTRA_DIST = $(ui_files) $(pixmap_DATA) $(Desktop_in_files) org.mate.mcc.mouse.gresource.xml ui-a11y.suppr
+EXTRA_DIST = \
+ $(ui_files) \
+ double-click-on.svg \
+ double-click-off.svg \
+ double-click-maybe.svg \
+ $(Desktop_in_files) \
+ org.mate.mcc.mouse.gresource.xml \
+ ui-a11y.suppr
 
 -include $(top_srcdir)/git.mk
diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index 98efc439..194d4609 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -33,7 +33,6 @@
 
 #include "capplet-util.h"
 #include "activate-settings-daemon.h"
-#include "capplet-stock-icons.h"
 #include "msd-input-helper.h"
 
 #include <sys/types.h>
@@ -80,8 +79,7 @@ test_maybe_timeout (struct test_data_t *data)
 {
 double_click_state = DOUBLE_CLICK_TEST_OFF;
 
- gtk_image_set_from_stock (GTK_IMAGE (data->image),
- MOUSE_DBLCLCK_OFF, mouse_capplet_dblclck_icon_get_size());
+ gtk_image_set_from_resource (GTK_IMAGE (data->image), "/org/mate/mcc/mouse/double-click-off.svg");
 
 *data->timeout_id = 0;
 
@@ -142,16 +140,13 @@ event_box_button_press_event (GtkWidget *widget,
 
 switch (double_click_state) {
 case DOUBLE_CLICK_TEST_ON:
- gtk_image_set_from_stock (GTK_IMAGE (image),
- MOUSE_DBLCLCK_ON, mouse_capplet_dblclck_icon_get_size());
+ gtk_image_set_from_resource (GTK_IMAGE (image), "/org/mate/mcc/mouse/double-click-on.svg");
 break;
 case DOUBLE_CLICK_TEST_MAYBE:
- gtk_image_set_from_stock (GTK_IMAGE (image),
- MOUSE_DBLCLCK_MAYBE, mouse_capplet_dblclck_icon_get_size());
+ gtk_image_set_from_resource (GTK_IMAGE (image), "/org/mate/mcc/mouse/double-click-maybe.svg");
 break;
 case DOUBLE_CLICK_TEST_OFF:
- gtk_image_set_from_stock (GTK_IMAGE (image),
- MOUSE_DBLCLCK_OFF, mouse_capplet_dblclck_icon_get_size());
+ gtk_image_set_from_resource (GTK_IMAGE (image), "/org/mate/mcc/mouse/double-click-off.svg");
 break;
 }
 
@@ -285,7 +280,7 @@ setup_dialog (GtkBuilder *dialog)
 gtk_range_get_adjustment (GTK_RANGE (WID ("delay_scale"))), "value",
 G_SETTINGS_BIND_DEFAULT);
 
- gtk_image_set_from_stock (GTK_IMAGE (WID ("double_click_image")), MOUSE_DBLCLCK_OFF, mouse_capplet_dblclck_icon_get_size ());
+ gtk_image_set_from_resource (GTK_IMAGE (WID ("double_click_image")), "/org/mate/mcc/mouse/double-click-off.svg");
 g_object_set_data (G_OBJECT (WID ("double_click_eventbox")), "image", WID ("double_click_image"));
 g_signal_connect (WID ("double_click_eventbox"), "button_press_event",
 G_CALLBACK (event_box_button_press_event), NULL);
@@ -435,8 +430,6 @@ main (int argc, char **argv)
 g_option_context_add_main_entries (context, cap_options, GETTEXT_PACKAGE);
 capplet_init (context, &argc, &argv);
 
- capplet_init_stock_icons ();
-
 activate_settings_daemon ();
 
 mouse_settings = g_settings_new (MOUSE_SCHEMA);
diff --git a/capplets/mouse/org.mate.mcc.mouse.gresource.xml b/capplets/mouse/org.mate.mcc.mouse.gresource.xml
index 5024edbe..395697a0 100644
--- a/capplets/mouse/org.mate.mcc.mouse.gresource.xml
+++ b/capplets/mouse/org.mate.mcc.mouse.gresource.xml
@@ -18,5 +18,8 @@
 <gresources>
 <gresource prefix="/org/mate/mcc/mouse">
 <file compressed="true">mate-mouse-properties.ui</file>
+ <file compressed="true">double-click-off.svg</file>
+ <file compressed="true">double-click-on.svg</file>
+ <file compressed="true">double-click-maybe.svg</file>
 </gresource>
 </gresources>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8bf096f3..8637a654 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,7 +29,6 @@ capplets/appearance/theme-installer.c
 capplets/appearance/theme-save.c
 capplets/appearance/theme-util.c
 capplets/common/activate-settings-daemon.c
-capplets/common/capplet-stock-icons.c
 capplets/common/capplet-util.c
 capplets/common/file-transfer-dialog.c
 capplets/common/mate-theme-info.c
author	rbuj <[email protected]>	2019-06-17 10:59:53 +0200
committer	Robert Antoni Buj Gelonch <[email protected]>	2019-06-18 20:40:37 +0200
commit	51e386fd4f5c60750c57a815203981754580e01d (patch)
tree	d3d4813e5f17ab9fd6c0b9e938b5af51c7a1eb31
parent	1a8ced9c5e6dd3f5bb2cd36a256f90e94a9f0d4d (diff)
download	mate-control-center-51e386fd4f5c60750c57a815203981754580e01d.tar.bz2 mate-control-center-51e386fd4f5c60750c57a815203981754580e01d.tar.xz