1 files changed, 7 insertions, 15 deletions
diff --git a/mate-volume-control/gvc-applet.c b/mate-volume-control/gvc-applet.c
index 3a08978..93e4623 100644
--- a/mate-volume-control/gvc-applet.c
+++ b/mate-volume-control/gvc-applet.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
@@ -508,14 +508,11 @@ menu_activate_open_volume_control (GtkAction *action, GvcApplet *applet)
 gboolean
 gvc_applet_fill (GvcApplet *applet, MatePanelApplet* applet_widget)
 {
- GdkEventMask event_mask;
- GdkWindow *window;
-
+#ifndef IN_PROCESS
 g_set_application_name (_("Volume Control Applet"));
 gtk_window_set_default_icon_name (APPLET_ICON);
-
 mate_panel_applet_set_flags (applet_widget, MATE_PANEL_APPLET_EXPAND_MINOR);
-
+#endif
 applet->priv->applet = applet_widget;
 /*FIXME: We haved to set this up BEFORE packing in icons. find a way to update this when the applet is moved that works*/
 switch (mate_panel_applet_get_orient (applet->priv->applet)) {
@@ -545,16 +542,11 @@ gvc_applet_fill (GvcApplet *applet, MatePanelApplet* applet_widget)
 gtk_container_add (GTK_CONTAINER (applet->priv->applet), GTK_WIDGET (applet->priv->box));
 gtk_widget_show_all (GTK_WIDGET (applet->priv->applet));
 
- /* Enable 'scroll-event' signal to get through */
- window = gtk_widget_get_window (GTK_WIDGET (applet->priv->icon_input));
- event_mask = gdk_window_get_events (window);
- gdk_window_set_events (window, event_mask | GDK_SCROLL_MASK);
-
- window = gtk_widget_get_window (GTK_WIDGET (applet->priv->icon_output));
- event_mask = gdk_window_get_events (window);
- gdk_window_set_events (window, event_mask | GDK_SCROLL_MASK);
+ /* Enable 'scroll-event' signal to be received */
+ gtk_widget_add_events (GTK_WIDGET(applet->priv->icon_input), GDK_SCROLL_MASK);
+ gtk_widget_add_events (GTK_WIDGET(applet->priv->icon_output), GDK_SCROLL_MASK);
 
- /* Update icons on size/orientation changes */
+ /* Update icons on size/orientation changes*/
 g_object_connect (applet->priv->applet,
 "signal::change_size", gvc_applet_set_size, applet,
 "signal::change_orient", gvc_applet_set_orient, applet,