[gnome-panel/wip/free-the-fish: 3/8] Rename nothing.{cP, h} to free-the-fish.{c, h}

[Sebastian Geiger <segeiger src gnome org>]

commit fd06dd67819b60b1dd7d5aaab8a43e3e2fedef9d
Author: Sebastian Geiger <sbastig gmx net>
Date:   Tue Jun 2 12:21:31 2015 +0200

    Rename nothing.{cP,h} to free-the-fish.{c,h}
    
     * This commit also fixes the includes for both files.

 gnome-panel/Makefile.am                     |    4 ++--
 gnome-panel/{nothing.cP => free-the-fish.c} |    7 ++++---
 gnome-panel/{nothing.h => free-the-fish.h}  |    2 ++
 gnome-panel/main.c                          |    2 --
 gnome-panel/panel-context-menu.c            |    2 +-
 gnome-panel/panel-run-dialog.c              |    2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 912c146..7901657 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -23,6 +23,7 @@ panel_sources =                       \
        panel-widget.c          \
        button-widget.c         \
        xstuff.c                \
+       free-the-fish.c \
        panel-session.c         \
        panel-compatibility.c   \
        panel.c                 \
@@ -70,6 +71,7 @@ panel_headers =                       \
        panel-globals.h         \
        button-widget.h         \
        xstuff.h                \
+       free-the-fish.h \
        panel-session.h         \
        panel-compatibility.h   \
        panel.h                 \
@@ -257,8 +259,6 @@ EXTRA_DIST =                                        \
        HighContrast.css \
        $(uitest_FILES)                         \
        panel-test-applets.gresource.xml        \
-       nothing.cP                              \
-       nothing.h                               \
        panel-marshal.list                      \
        $(desktop_in_files)
 
diff --git a/gnome-panel/nothing.cP b/gnome-panel/free-the-fish.c
similarity index 99%
rename from gnome-panel/nothing.cP
rename to gnome-panel/free-the-fish.c
index 81e4c4d..7f18f44 100644
--- a/gnome-panel/nothing.cP
+++ b/gnome-panel/free-the-fish.c
@@ -1,6 +1,7 @@
-#include <X11/Xlib.h>
+#include <gtk/gtk.h>
+#include <string.h>
 
-#include "nothing.h"
+#include "free-the-fish.h"
 
 /* phish code */
 #define PHSHFRAMES 8
@@ -373,7 +374,7 @@ check_screen_timeout (gpointer data)
 }
 
 void
-start_screen_check (void)
+start_screen_check(void)
 {
         if (screen_check_id > 0)
                 g_source_remove (screen_check_id);
diff --git a/gnome-panel/nothing.h b/gnome-panel/free-the-fish.h
similarity index 84%
rename from gnome-panel/nothing.h
rename to gnome-panel/free-the-fish.h
index 0539152..2b9d9c3 100644
--- a/gnome-panel/nothing.h
+++ b/gnome-panel/free-the-fish.h
@@ -1,3 +1,5 @@
+#include <glib.h>
+
 #ifndef NOTHING_H
 #define NOTHING_H
 
diff --git a/gnome-panel/main.c b/gnome-panel/main.c
index cd39636..4cbf604 100644
--- a/gnome-panel/main.c
+++ b/gnome-panel/main.c
@@ -25,8 +25,6 @@
 #include "panel-layout.h"
 #include "xstuff.h"
 
-#include "nothing.cP"
-
 /* globals */
 GSList *panels = NULL;
 GSList *panel_list = NULL;
diff --git a/gnome-panel/panel-context-menu.c b/gnome-panel/panel-context-menu.c
index 607788d..125fbae 100644
--- a/gnome-panel/panel-context-menu.c
+++ b/gnome-panel/panel-context-menu.c
@@ -35,7 +35,7 @@
 #include <libpanel-util/panel-error.h>
 #include <libpanel-util/panel-show.h>
 
-#include "nothing.h"
+#include "free-the-fish.h"
 #include "panel-util.h"
 #include "panel.h"
 #include "menu.h"
diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
index e76a067..1d7fca2 100644
--- a/gnome-panel/panel-run-dialog.c
+++ b/gnome-panel/panel-run-dialog.c
@@ -48,7 +48,7 @@
 #include <libpanel-util/panel-show.h>
 #include <libpanel-util/panel-xdg.h>
 
-#include "nothing.h"
+#include "free-the-fish.h"
 #include "panel-util.h"
 #include "panel-globals.h"
 #include "panel-enums.h"