[libepc] Fix the build with --enable-compiler-warnings=error
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libepc] Fix the build with --enable-compiler-warnings=error
- Date: Thu, 12 May 2011 19:37:34 +0000 (UTC)
commit 59850a28758ee83ed307625f15dec692d288bd16
Author: Murray Cumming <murrayc murrayc com>
Date: Thu May 12 21:32:53 2011 +0200
Fix the build with --enable-compiler-warnings=error
* libepc-ui/progress-window.c
* examples/consumer-ui.c: Remove ifdefed code for older versions
of GTK+. We use GTK+ 3 now anyway. This was causing a compiler
warning about extra tokens after #ifdef.
ChangeLog | 9 +++++++++
examples/consumer-ui.c | 4 ----
libepc-ui/progress-window.c | 4 ----
3 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ed3cdcb..0b3012b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-12 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with --enable-compiler-warnings=error
+
+ * libepc-ui/progress-window.c
+ * examples/consumer-ui.c: Remove ifdefed code for older versions
+ of GTK+. We use GTK+ 3 now anyway. This was causing a compiler
+ warning about extra tokens after #ifdef.
+
2010-05-12 Christopher Dale <chrelad gmail com>
Use avahi-ui-gtk3 rather than avahi-ui-gtk.
diff --git a/examples/consumer-ui.c b/examples/consumer-ui.c
index 42a3bb6..2569de9 100644
--- a/examples/consumer-ui.c
+++ b/examples/consumer-ui.c
@@ -169,12 +169,8 @@ create_lookup_dialog (EpcConsumer *consumer,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
-#ifdef GTK_CHECK_VERSION (2, 14, 0) && GSEAL_ENABLE
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox, TRUE, TRUE, 0);
-#else
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
-#endif
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 350);
return dialog;
diff --git a/libepc-ui/progress-window.c b/libepc-ui/progress-window.c
index 73e9c0c..648f828 100644
--- a/libepc-ui/progress-window.c
+++ b/libepc-ui/progress-window.c
@@ -118,11 +118,7 @@ static void
epc_progress_window_realize (GtkWidget *widget)
{
GTK_WIDGET_CLASS (epc_progress_window_parent_class)->realize (widget);
-#ifdef GTK_CHECK_VERSION (2, 14, 0)
gdk_window_set_decorations (gtk_widget_get_window (widget), GDK_DECOR_BORDER);
-#else
- gdk_window_set_decorations (widget->window, GDK_DECOR_BORDER);
-#endif
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]