diff options
Diffstat (limited to 'capplets/mouse')
| -rw-r--r-- | capplets/mouse/Makefile.am | 15 | ||||
| -rw-r--r-- | capplets/mouse/mate-mouse-properties.c | 17 | ||||
| -rw-r--r-- | capplets/mouse/org.mate.mcc.mouse.gresource.xml | 3 |
3 files changed, 16 insertions, 19 deletions
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> |