This is an automated email from the git hooks/post-receive script. ochosi pushed a commit to branch master in repository apps/xfce4-notifyd.
commit 1ebdc11cf5e710c73be6bcf72d43d908a1fc9fde Author: Ali Abdallah <ali...@gmail.com> Date: Sun Oct 11 20:07:30 2015 +0200 Port the settings dialog to gtk3 --- Makefile.am | 24 ++++++++++++++---------- configure.ac.in | 2 ++ xfce4-notifyd-config/main.c | 9 +++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index b7f069b..4604a91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,9 +40,7 @@ xfce4_notifyd_config_xfce4_notifyd_config_SOURCES = \ common_cflags = \ -I$(builddir) \ -DLOCALEDIR=\"$(localedir)\" \ - $(GTK_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) \ - $(LIBXFCE4UI_CFLAGS) \ $(XFCONF_CFLAGS) xfce4_notifyd_xfce4_notifyd_CFLAGS = \ @@ -50,28 +48,34 @@ xfce4_notifyd_xfce4_notifyd_CFLAGS = \ $(common_cflags) \ $(LIBX11_CFLAGS) \ $(GIO_CFLAGS) \ - $(GIO_UNIX_CFLAGS) + $(GIO_UNIX_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) + xfce4_notifyd_config_xfce4_notifyd_config_CFLAGS = \ -DG_LOG_DOMAIN=\"xfce4-notifyd-config\" \ $(LIBNOTIFY_CFLAGS) \ + $(LIBXFCE4UI2_CFLAGS) \ + $(GTK3_CFLAGS) \ $(common_cflags) common_ldadd = \ - $(GTK_LIBS) \ $(LIBXFCE4UTIL_LIBS) \ - $(LIBXFCE4UI_LIBS) \ - $(XFCONF_LIBS) \ - $(GIO_LIBS) \ - $(GIO_UNIX_LIBS) + $(XFCONF_LIBS) xfce4_notifyd_xfce4_notifyd_LDADD = \ $(common_ldadd) \ - $(LIBX11_LIBS) + $(LIBX11_LIBS) \ + $(GIO_LIBS) \ + $(GIO_UNIX_LIBS) \ + $(LIBXFCE4UI_LIBS) xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \ $(common_ldadd) \ - $(LIBNOTIFY_LIBS) + $(LIBXFCE4UI2_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(GTK3_LIBS) servicedir = $(datadir)/dbus-1/services diff --git a/configure.ac.in b/configure.ac.in index b62361e..b47376e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -63,8 +63,10 @@ XDT_CHECK_LIBX11_REQUIRE() dnl required XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.10.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [0.1.0svn-r26876]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.14.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.26.0]) XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.26.0]) XDT_CHECK_PACKAGE([LIBNOTIFY], [libnotify], [0.7.0]) diff --git a/xfce4-notifyd-config/main.c b/xfce4-notifyd-config/main.c index 5977749..006b31d 100644 --- a/xfce4-notifyd-config/main.c +++ b/xfce4-notifyd-config/main.c @@ -30,6 +30,7 @@ #endif #include <gtk/gtk.h> +#include <gtk/gtkx.h> #include <dbus/dbus-glib.h> @@ -256,10 +257,10 @@ xfce4_notifyd_config_setup_dialog(GtkBuilder *builder) if(!xfconf_init(&error)) { xfce_message_dialog(NULL, _("Xfce Notify Daemon"), - GTK_STOCK_DIALOG_ERROR, + "dialog-error", _("Settings daemon is unavailable"), error->message, - GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, + "application-exit", GTK_RESPONSE_ACCEPT, NULL); exit(EXIT_FAILURE); } @@ -305,7 +306,7 @@ main(int argc, GtkWidget *settings_dialog = NULL; GtkBuilder *builder; gboolean opt_version = FALSE; - GdkNativeWindow opt_socket_id = 0; + gint32 opt_socket_id = 0; GOptionEntry option_entries[] = { { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version, N_("Display version information"), NULL }, { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET_ID") }, @@ -360,7 +361,7 @@ main(int argc, G_CALLBACK(gtk_main_quit), NULL); plug_child = GTK_WIDGET(gtk_builder_get_object(builder, "plug-child")); - gtk_widget_reparent(plug_child, plug); + gtk_container_add (GTK_CONTAINER(plug), plug_child); gtk_widget_show(plug_child); gdk_notify_startup_complete(); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits