From fde071cf592583be95028e18b25b54e9ff7d3a60 Mon Sep 17 00:00:00 2001 From: Romain Bouvier Date: Wed, 12 May 2010 09:53:15 +0200 Subject: [PATCH] Port xfce4-datetime-plugin to libxfce4ui --- configure.in.in | 4 ++-- panel-plugin/Makefile.am | 4 ++-- panel-plugin/datetime-dialog.c | 10 +++++----- panel-plugin/datetime.c | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure.in.in b/configure.in.in index 4d58211..ff91744 100644 --- a/configure.in.in +++ b/configure.in.in @@ -30,8 +30,8 @@ dnl Check for i18n support XDT_I18N([@LINGUAS@]) dnl Check for required packages -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.3.99.2]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 4005f85..6f0bb00 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -16,7 +16,7 @@ libdatetime_la_CFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ $(GTK_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) libdatetime_la_LDFLAGS = \ @@ -31,7 +31,7 @@ endif libdatetime_la_LIBADD = \ $(GTK_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4UTIL_LIBS) desktopdir = $(datadir)/xfce4/panel-plugins diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c index 193587e..3894df6 100644 --- a/panel-plugin/datetime-dialog.c +++ b/panel-plugin/datetime-dialog.c @@ -28,9 +28,9 @@ #include /* xfce includes */ -#include +#include #include -#include +#include #include "datetime.h" #include "datetime-dialog.h" @@ -388,7 +388,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * layout frame */ - frame = xfce_create_framebox(_("Layout"), &bin); + frame = xfce_gtk_frame_box_new(_("Layout"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(frame), 6); @@ -422,7 +422,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * Date frame */ - datetime->date_frame = xfce_create_framebox(_("Date"), &bin); + datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->date_frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(datetime->date_frame), 6); @@ -525,7 +525,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * time frame */ - datetime->time_frame = xfce_create_framebox(_("Time"), &bin); + datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->time_frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(datetime->time_frame), 6); diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c index 30ee04a..48e6edc 100644 --- a/panel-plugin/datetime.c +++ b/panel-plugin/datetime.c @@ -28,10 +28,9 @@ #include /* xfce includes */ -#include +#include #include -#include -#include +#include #include "xfce46-compat.h" -- 1.7.1