summaryrefslogtreecommitdiff
path: root/applets/fish
diff options
context:
space:
mode:
Diffstat (limited to 'applets/fish')
-rw-r--r--applets/fish/Makefile.am2
-rw-r--r--applets/fish/fish.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 814d5d8c..604983a3 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -53,9 +53,9 @@ $(applet_in_files): $(applet_in_files).in Makefile
$(applet_DATA): $(applet_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+service_in_files = org.mate.panel.applet.FishAppletFactory.service.in
if !FISH_INPROCESS
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.FishAppletFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.FishAppletFactory.service: $(service_in_files)
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 45ce9228..d70d250a 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -819,7 +819,6 @@ static void display_fortune_dialog(FishApplet* fish)
int argc;
char **argv;
GdkDisplay *display;
- GdkScreen *screen;
char *display_name;
/* if there is still a pipe, close it */
@@ -937,8 +936,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,