summaryrefslogtreecommitdiffstats
path: root/avahi-ui
diff options
context:
space:
mode:
Diffstat (limited to 'avahi-ui')
-rw-r--r--avahi-ui/Makefile.am41
-rw-r--r--avahi-ui/avahi-ui.c19
-rw-r--r--avahi-ui/avahi-ui.h2
-rw-r--r--avahi-ui/bssh.c3
4 files changed, 40 insertions, 25 deletions
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 6dbbd24..72d6023 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
# This file is part of avahi.
-#
+#
# avahi is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation; either version 2 of the
@@ -23,13 +21,13 @@ AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -D
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
desktopdir = $(datadir)/applications
-desktop_DATA =
+desktop_DATA =
desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in
EXTRA_DIST = $(desktop_DATA_in_in)
-if HAVE_GTK
+if HAVE_GTK2OR3
AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
if HAVE_DBUS
if HAVE_GLIB
@@ -39,8 +37,17 @@ avahiincludedir=$(includedir)/avahi-ui
avahiinclude_HEADERS = \
avahi-ui.h
-lib_LTLIBRARIES = \
- libavahi-ui.la
+lib_LTLIBRARIES =
+
+if HAVE_GTK
+lib_LTLIBRARIES += \
+ libavahi-ui.la
+endif
+
+if HAVE_GTK3
+lib_LTLIBRARIES += \
+ libavahi-ui-gtk3.la
+endif
libavahi_ui_la_SOURCES = \
avahi-ui.h avahi-ui.c
@@ -48,15 +55,25 @@ libavahi_ui_la_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
libavahi_ui_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK20_LIBS)
libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
+libavahi_ui_gtk3_la_SOURCES = $(libavahi_ui_la_SOURCES)
+libavahi_ui_gtk3_la_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK30_LIBS)
+libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
+
if HAVE_GDBM
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
libavahi_ui_la_LIBADD += -lgdbm
+
+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_gtk3_la_LIBADD += -lgdbm
endif
if HAVE_DBM
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+
+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
endif
bin_PROGRAMS = bssh
@@ -64,8 +81,14 @@ desktop_DATA += bssh.desktop bvnc.desktop
@INTLTOOL_DESKTOP_RULE@
bssh_SOURCES = bssh.c
+
+if HAVE_GTK3
+bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la
+else
bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
+endif
install-exec-local:
cd $(DESTDIR)/$(bindir) && \
@@ -74,10 +97,10 @@ install-exec-local:
$(LN_S) bssh bshell
bssh.desktop.in: bssh.desktop.in.in
- sed -e 's,@bindir\@,$(bindir),g' $< > $@
+ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
bvnc.desktop.in: bvnc.desktop.in.in
- sed -e 's,@bindir\@,$(bindir),g' $< > $@
+ $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
endif # HAVE_GLIB
endif
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
index bd2b3cc..6f2fcbe 100644
--- a/avahi-ui/avahi-ui.c
+++ b/avahi-ui/avahi-ui.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -30,7 +28,6 @@
#include <net/if.h>
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
#include <avahi-glib/glib-watch.h>
#include <avahi-client/client.h>
@@ -131,16 +128,16 @@ static void aui_service_dialog_get_property(GObject *object, guint prop_id, GVal
static int get_default_response(GtkDialog *dlg) {
gint ret = GTK_RESPONSE_NONE;
- if (GTK_WINDOW(dlg)->default_widget)
+ if (gtk_window_get_default_widget(GTK_WINDOW(dlg)))
/* Use the response of the default widget, if possible */
- ret = gtk_dialog_get_response_for_widget(dlg, GTK_WINDOW(dlg)->default_widget);
+ ret = gtk_dialog_get_response_for_widget(dlg, gtk_window_get_default_widget(GTK_WINDOW(dlg)));
if (ret == GTK_RESPONSE_NONE) {
/* Fall back to finding the first positive response */
GList *children, *t;
gint bad = GTK_RESPONSE_NONE;
- t = children = gtk_container_get_children(GTK_CONTAINER(dlg->action_area));
+ t = children = gtk_container_get_children(GTK_CONTAINER(gtk_dialog_get_action_area(dlg)));
while (t) {
GtkWidget *child = t->data;
@@ -890,7 +887,7 @@ static void response_callback(GtkDialog *dialog, gint response, gpointer user_da
gtk_widget_set_sensitive(GTK_WIDGET(dialog), FALSE);
cursor = gdk_cursor_new(GDK_WATCH);
- gdk_window_set_cursor(GTK_WIDGET(dialog)->window, cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(dialog)), cursor);
gdk_cursor_unref(cursor);
if (!(d->priv->resolver = avahi_service_resolver_new(
@@ -992,7 +989,7 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(p->domain_dialog)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
p->domain_entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(p->domain_entry), AVAHI_DOMAIN_NAME_MAX);
@@ -1114,7 +1111,7 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
p->domain_label = gtk_label_new(_("Initializing..."));
gtk_label_set_ellipsize(GTK_LABEL(p->domain_label), TRUE);
@@ -1165,8 +1162,8 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
p->domain_button = gtk_button_new_with_mnemonic(_("_Domain..."));
gtk_button_set_image(GTK_BUTTON(p->domain_button), gtk_image_new_from_stock(GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON));
g_signal_connect(p->domain_button, "clicked", G_CALLBACK(domain_button_clicked), d);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), p->domain_button, FALSE, TRUE, 0);
- gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(GTK_DIALOG(d)->action_area), p->domain_button, TRUE);
+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, FALSE, TRUE, 0);
+ gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d))), p->domain_button, TRUE);
gtk_widget_show(p->domain_button);
gtk_dialog_set_default_response(GTK_DIALOG(d), GTK_RESPONSE_ACCEPT);
diff --git a/avahi-ui/avahi-ui.h b/avahi-ui/avahi-ui.h
index d780f83..aae61dc 100644
--- a/avahi-ui/avahi-ui.h
+++ b/avahi-ui/avahi-ui.h
@@ -1,8 +1,6 @@
#ifndef fooavahiuihfoo
#define fooavahiuihfoo
-/* $Id$ */
-
/***
This file is part of avahi.
diff --git a/avahi-ui/bssh.c b/avahi-ui/bssh.c
index e4a190b..491380f 100644
--- a/avahi-ui/bssh.c
+++ b/avahi-ui/bssh.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
/***
This file is part of avahi.
@@ -31,7 +29,6 @@
#include <getopt.h>
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
#include <avahi-client/client.h>
#include <avahi-common/strlst.h>
generated by cgit (git 2.34.1) at 2025-12-03 01:24:55 +0000