summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Rocha <lucasr@gnome.org>2009-01-09 00:10:30 +0000
committerLucas Almeida Rocha <lucasr@src.gnome.org>2009-01-09 00:10:30 +0000
commitbd9e29d33ac1ed929ee09ccdffaf59d4db428fe9 (patch)
tree1a14d163748350a9e5803a477d1331058f1d3fcd
parentcorrectly handle --filename option on file selection mode (Fixes bug (diff)
downloadzenity-bd9e29d33ac1ed929ee09ccdffaf59d4db428fe9.tar.gz
zenity-bd9e29d33ac1ed929ee09ccdffaf59d4db428fe9.tar.bz2
zenity-bd9e29d33ac1ed929ee09ccdffaf59d4db428fe9.zip
GNOME Goal: Clean up GLib and GTK+ includes (Fixes bug #563855). Patch
2009-01-09 Lucas Rocha <lucasr@gnome.org> * src/main.c: * src/option.h: GNOME Goal: Clean up GLib and GTK+ includes (Fixes bug #563855). Patch from Pedro Fragoso <ember@ubuntu.com>. svn path=/trunk/; revision=1462
-rw-r--r--ChangeLog7
-rw-r--r--src/main.c2
-rw-r--r--src/option.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1127157c..a60f0936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-01-09 Lucas Rocha <lucasr@gnome.org>
+ * src/main.c:
+ * src/option.h:
+ GNOME Goal: Clean up GLib and GTK+ includes (Fixes bug #563855).
+ Patch from Pedro Fragoso <ember@ubuntu.com>.
+
+2009-01-09 Lucas Rocha <lucasr@gnome.org>
+
* src/fileselection.c (zenity_fileselection): correctly handle
--filename option on file selection mode (Fixes bug #564552).
Patch from Gilles Detillieux.
diff --git a/src/main.c b/src/main.c
index 1c37de2c..4f87e6df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,7 +27,7 @@
#include "option.h"
#include <stdlib.h>
-#include <glib/goption.h>
+#include <glib.h>
#include <gtk/gtk.h>
#include <langinfo.h>
#ifdef HAVE_LOCALE_H
diff --git a/src/option.h b/src/option.h
index cce0553d..2b7a703b 100644
--- a/src/option.h
+++ b/src/option.h
@@ -26,7 +26,7 @@
#define OPTION_H
#include "zenity.h"
-#include <glib/goption.h>
+#include <glib.h>
#include <langinfo.h>
#ifdef HAVE_LOCALE_H
#include <locale.h>
bgstack15