forgotten patch

This commit is contained in:
Matthias Clasen 2010-11-02 00:14:51 -04:00
parent e8ff3506a7
commit b94d88a116

47
gtk3-fix.patch Normal file
View File

@ -0,0 +1,47 @@
From fc2ac4ab73a27341ffd7eecc06f836dc9d1bbb85 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 16 Sep 2010 16:19:35 -0400
Subject: [PATCH 1/1] gtk: avahi build fix
Hey,
avahi-0.26.7 braucht einen kleinen fix, um mit gtk+ 2.21.8/2.90.7 zu
bauen. See attachment.
---
avahi-ui/avahi-ui.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
index 62ccd18..2569ba0 100644
--- a/avahi-ui/avahi-ui.c
+++ b/avahi-ui/avahi-ui.c
@@ -254,11 +254,13 @@ GtkWidget *aui_service_dialog_new_valist(
const gchar *button_text;
gint dr;
- GtkWidget *w = GTK_WIDGET(g_object_new(
+ GtkWidget *w = (GtkWidget*)g_object_new(
AUI_TYPE_SERVICE_DIALOG,
+#if !GTK_CHECK_VERSION (2,21,8)
"has-separator", FALSE,
+#endif
"title", title,
- NULL));
+ NULL);
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(w), parent);
@@ -985,7 +987,9 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
p->domain_dialog = gtk_dialog_new();
gtk_container_set_border_width(GTK_CONTAINER(p->domain_dialog), 5);
gtk_window_set_title(GTK_WINDOW(p->domain_dialog), _("Change domain"));
+#if !GTK_CHECK_VERSION(2,21,8)
gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
+#endif
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
--
1.6.3.3