Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support GTK+ 4.0 #90

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Support GTK+ 4.0 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eff438b
avahi-ui: Avoid deprecated gtk_dialog_get_action_area().
murraycu Nov 16, 2016
baff42e
avahi-ui: Avoid deprecated gdk_cursor_new().
murraycu Nov 16, 2016
a8666f8
avahi-ui: Avoid deprecated gtk_misc_set_alignment().
murraycu Nov 16, 2016
20488af
Build: Support GTK+ 4.
murraycu Nov 16, 2016
3155dae
avahi-ui: Avoid removed (in GTK+4) gtk_container_set_border_width().
murraycu Nov 16, 2016
b8e44d0
avahi-ui: Adapt to (changed in GTK+4) gtk_box_pack_start/end().
murraycu Nov 16, 2016
e1811b8
avahi-ui: Avoid (removed in GTK+4) gtk_button_set_image().
murraycu Nov 16, 2016
fd172a9
avahi-ui: Correct calls to gtk_init() for gtk+ 4.
murraycu Mar 17, 2017
cbdc2ce
avahi-ui: Avoid calling gtk_widget_show_all() with gtk+ 4.
murraycu Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,13 @@ CLEANFILES += avahi-ui-gtk3.pc
endif
endif

if HAVE_GTK4
if HAVE_DBUS
pkgconfig_DATA += avahi-ui-gtk4.pc
CLEANFILES += avahi-ui-gtk4.pc
endif
endif

if HAVE_QT3
pkgconfig_DATA += avahi-qt3.pc
CLEANFILES += avahi-qt3.pc
Expand Down
9 changes: 8 additions & 1 deletion avahi-discover-standalone/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ interfaces = \
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'

if HAVE_GTK2OR3
if HAVE_GTK2OR3OR4
if HAVE_GLIB
bin_PROGRAMS = \
avahi-discover-standalone
Expand All @@ -41,6 +41,12 @@ avahi_discover_standalone_LDADD = \
../avahi-glib/libavahi-glib.la \
../avahi-core/libavahi-core.la

if HAVE_GTK4
avahi_discover_standalone_CFLAGS += \
$(GLIB30_CFLAGS) $(GTK40_CFLAGS)
avahi_discover_standalone_LDADD += \
$(GLIB30_LIBS) $(GTK40_LIBS)
else
if HAVE_GTK3
avahi_discover_standalone_CFLAGS += \
$(GLIB30_CFLAGS) $(GTK30_CFLAGS)
Expand All @@ -52,6 +58,7 @@ avahi_discover_standalone_CFLAGS += \
avahi_discover_standalone_LDADD += \
$(GLIB20_LIBS) $(GTK20_LIBS)
endif
endif

interfaces_DATA = $(interfaces)

Expand Down
4 changes: 4 additions & 0 deletions avahi-discover-standalone/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,11 @@ int main(int argc, char *argv[]) {
gint error;
AvahiGLibPoll *poll_api;

#if !GTK_CHECK_VERSION (3,89,0)
gtk_init(&argc, &argv);
#else
gtk_init();
#endif

avahi_set_allocator(avahi_glib_allocator());

Expand Down
11 changes: 11 additions & 0 deletions avahi-ui-gtk4.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=${prefix}
libdir=@libdir@
includedir=${prefix}/include

Name: avahi-ui
Description: Avahi Multicast DNS Responder (Common GTK4 UI support)
Requires: gtk+-4.0 avahi-client avahi-glib
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lavahi-ui-gtk4
Cflags: -D_REENTRANT -I${includedir}
20 changes: 19 additions & 1 deletion avahi-ui/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in

EXTRA_DIST = $(desktop_DATA_in_in)

if HAVE_GTK2OR3
if HAVE_GTK2OR3OR4
AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
if HAVE_DBUS
if HAVE_GLIB
Expand All @@ -51,6 +51,11 @@ lib_LTLIBRARIES += \
libavahi-ui-gtk3.la
endif

if HAVE_GTK4
lib_LTLIBRARIES += \
libavahi-ui-gtk4.la
endif

libavahi_ui_la_SOURCES = \
avahi-ui.h avahi-ui.c
libavahi_ui_la_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
Expand All @@ -62,13 +67,21 @@ 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)

libavahi_ui_gtk4_la_SOURCES = $(libavahi_ui_la_SOURCES)
libavahi_ui_gtk4_la_CFLAGS = $(AM_CFLAGS) $(GTK40_CFLAGS)
libavahi_ui_gtk4_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK40_LIBS)
libavahi_ui_gtk4_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=\"$(pkglibdatadir)/service-types.db\"
libavahi_ui_la_LIBADD += -lgdbm

libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
libavahi_ui_gtk3_la_LIBADD += -lgdbm

libavahi_ui_gtk4_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
libavahi_ui_gtk4_la_LIBADD += -lgdbm
endif

if HAVE_DBM
Expand All @@ -84,13 +97,18 @@ desktop_DATA += bssh.desktop bvnc.desktop

bssh_SOURCES = bssh.c

if HAVE_GTK4
bssh_CFLAGS = $(AM_CFLAGS) $(GTK40_CFLAGS)
bssh_LDADD = $(AM_LDADD) $(GTK40_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk4.la
else
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
endif

install-exec-local:
cd $(DESTDIR)/$(bindir) && \
Expand Down
Loading