summaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
Diffstat (limited to 'applets')
-rw-r--r--applets/clock/clock.c3
-rw-r--r--applets/fish/fish.c3
-rw-r--r--applets/wncklet/window-list.c7
-rw-r--r--applets/wncklet/window-list.ui1
4 files changed, 6 insertions, 8 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index fee7edf2..0eee5766 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -922,8 +922,7 @@ position_calendar_popup (ClockData *cd)
button_w = allocation.width;
button_h = allocation.height;
- screen = gtk_window_get_screen (GTK_WINDOW (cd->calendar_popup));
- display = gdk_screen_get_display (screen);
+ display = gtk_widget_get_display (GTK_WIDGET (cd->calendar_popup));
n = gdk_display_get_n_monitors (display);
for (i = 0; i < n; i++) {
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 45ce9228..e0898334 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -937,8 +937,7 @@ static void display_fortune_dialog(FishApplet* fish)
clear_fortune_text (fish);
- screen = gtk_widget_get_screen (GTK_WIDGET (fish));
- display = gdk_screen_get_display (screen);
+ display = gtk_widget_get_display (GTK_WIDGET (fish));
display_name = g_strdup (gdk_display_get_name (display));
g_spawn_async_with_pipes (NULL, /* working directory */
argv,
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 93785cc1..3e828264 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -786,16 +786,15 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
tasklist->applet = GTK_WIDGET(applet);
provider = gtk_css_provider_new ();
- screen = gdk_screen_get_default ();
gtk_css_provider_load_from_data (provider,
".mate-panel-menu-bar button,\n"
" #tasklist-button {\n"
" padding: 0px;\n"
" margin: 0px;\n }",
-1, NULL);
- gtk_style_context_add_provider_for_screen (screen,
- GTK_STYLE_PROVIDER (provider),
- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (tasklist->applet),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref (provider);
mate_panel_applet_set_flags(MATE_PANEL_APPLET(tasklist->applet), MATE_PANEL_APPLET_EXPAND_MAJOR | MATE_PANEL_APPLET_EXPAND_MINOR | MATE_PANEL_APPLET_HAS_HANDLE);
diff --git a/applets/wncklet/window-list.ui b/applets/wncklet/window-list.ui
index 4cc49f9c..2ed06c0e 100644
--- a/applets/wncklet/window-list.ui
+++ b/applets/wncklet/window-list.ui
@@ -76,6 +76,7 @@
<object class="GtkNotebook">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="border_width">5</property>
<child>
<object class="GtkBox" id="behaviour_vbox">
<property name="visible">True</property>