]> git.meshlink.io Git - catta/commitdiff
gtk: avahi build fix
authorMatthias Clasen <mclasen@redhat.com>
Thu, 16 Sep 2010 20:19:35 +0000 (16:19 -0400)
committerLennart Poettering <lennart@poettering.net>
Sun, 19 Sep 2010 21:30:51 +0000 (23:30 +0200)
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

index 62ccd1840d26483f39ec16b262bd462eb372f6ff..2569ba0cc0f4a49e1f40d74588b5bf99769e6f88 100644 (file)
@@ -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);