|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/detectwm.h gshutdown-0.2/src/detectwm.h
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/detectwm.h 2007-04-14 18:33:39.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/detectwm.h 2012-07-26 17:31:10.897204758 -0400
|
|
|
fc3f2e8 |
@@ -21,7 +21,7 @@
|
|
|
fc3f2e8 |
#ifndef __GSHUTDOWN_WMDETECT__
|
|
|
fc3f2e8 |
#define __GSHUTDOWN_WMDETECT__
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
-#include <glib/gtypes.h>
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
gchar *detect_window_manager();
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/main.c gshutdown-0.2/src/main.c
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/main.c 2007-06-24 09:03:38.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/main.c 2012-07-26 17:31:28.721313304 -0400
|
|
|
fc3f2e8 |
@@ -21,7 +21,7 @@
|
|
|
fc3f2e8 |
#include <stdlib.h>
|
|
|
fc3f2e8 |
#include <signal.h>
|
|
|
fc3f2e8 |
#include <sys/wait.h>
|
|
|
fc3f2e8 |
-#include <glib/gutils.h> /* g_atexit() */
|
|
|
fc3f2e8 |
+#include <glib.h> /* g_atexit() */
|
|
|
fc3f2e8 |
#include "main.h"
|
|
|
fc3f2e8 |
#include "gui.h"
|
|
|
fc3f2e8 |
#include "misc.h"
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/misc.c gshutdown-0.2/src/misc.c
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/misc.c 2007-04-14 18:33:39.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/misc.c 2012-07-26 17:31:37.063365054 -0400
|
|
|
fc3f2e8 |
@@ -20,12 +20,7 @@
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
#include <unistd.h> /* X_OK */
|
|
|
fc3f2e8 |
#include <stdlib.h>
|
|
|
fc3f2e8 |
-#include <glib/gstdio.h>
|
|
|
fc3f2e8 |
-#include <glib/gstrfuncs.h> /* g_strdup_printf */
|
|
|
fc3f2e8 |
-#include <glib/gmem.h> /* g_free */
|
|
|
fc3f2e8 |
-#include <glib/gutils.h> /* g_getenv */
|
|
|
fc3f2e8 |
-#include <glib/gfileutils.h> /* g_file_test() */
|
|
|
fc3f2e8 |
-#include <glib/gshell.h> /* g_shell_parse_argv */
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
#include "config.h"
|
|
|
fc3f2e8 |
#include "misc.h"
|
|
|
fc3f2e8 |
#include "main.h"
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/misc.h gshutdown-0.2/src/misc.h
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/misc.h 2007-04-14 18:33:39.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/misc.h 2012-07-26 17:31:14.890227639 -0400
|
|
|
fc3f2e8 |
@@ -20,7 +20,7 @@
|
|
|
fc3f2e8 |
#ifndef __GSHUTDOWN_MISC__
|
|
|
fc3f2e8 |
#define __GSHUTDOWN_MISC__
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
-#include <glib/gtypes.h> /* gchar */
|
|
|
fc3f2e8 |
+#include <glib.h> /* gchar */
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
/* Return a data file path. e.g: gshutdown.glade */
|
|
|
fc3f2e8 |
gchar *data_path(gchar *filename);
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/timer.c gshutdown-0.2/src/timer.c
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/timer.c 2007-05-19 07:30:38.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/timer.c 2012-07-26 17:31:47.236428555 -0400
|
|
|
fc3f2e8 |
@@ -18,7 +18,7 @@
|
|
|
fc3f2e8 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
fc3f2e8 |
*/
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
-#include <glib/gtypes.h>
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
#include "timer.h"
|
|
|
fc3f2e8 |
#include "values.h"
|
|
|
fc3f2e8 |
#include "gui.h"
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/timer.h gshutdown-0.2/src/timer.h
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/timer.h 2007-04-14 18:33:39.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/timer.h 2012-07-26 17:31:19.380254673 -0400
|
|
|
fc3f2e8 |
@@ -21,7 +21,7 @@
|
|
|
fc3f2e8 |
#ifndef __GSHUTDOWN_TIMER__
|
|
|
fc3f2e8 |
#define __GSHUTDOWN_TIMER__
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
-#include <glib/gtypes.h>
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
guint time_left();
|
|
|
fc3f2e8 |
gboolean timer_notify();
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/values.c gshutdown-0.2/src/values.c
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/values.c 2007-04-14 18:33:40.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/values.c 2012-07-26 17:31:53.540468680 -0400
|
|
|
fc3f2e8 |
@@ -20,8 +20,7 @@
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
#include <stdio.h>
|
|
|
fc3f2e8 |
#include <string.h>
|
|
|
fc3f2e8 |
-#include <glib/gkeyfile.h>
|
|
|
fc3f2e8 |
-#include <glib/gfileutils.h> /* g_build_path */
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
#include "values.h"
|
|
|
fc3f2e8 |
#include "gui.h"
|
|
|
fc3f2e8 |
#include "detectwm.h"
|
|
|
fc3f2e8 |
diff -Naur gshutdown-0.2.orig/src/values.h gshutdown-0.2/src/values.h
|
|
|
fc3f2e8 |
--- gshutdown-0.2.orig/src/values.h 2007-05-19 07:42:54.000000000 -0400
|
|
|
fc3f2e8 |
+++ gshutdown-0.2/src/values.h 2012-07-26 17:31:23.534280881 -0400
|
|
|
fc3f2e8 |
@@ -21,7 +21,7 @@
|
|
|
fc3f2e8 |
#ifndef __GSHUTDOWN_VALUES__
|
|
|
fc3f2e8 |
#define __GSHUTDOWN_VALUES__
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
-#include <glib/gtypes.h>
|
|
|
fc3f2e8 |
+#include <glib.h>
|
|
|
fc3f2e8 |
#include "action.h"
|
|
|
fc3f2e8 |
|
|
|
fc3f2e8 |
typedef enum {
|