Репозитории ALT
S: | 0.8.3-alt1 |
5.1: | 0.6.1-alt1 |
4.1: | 0.5.0-alt1.M41.1 |
4.0: | 0.4.1-alt1 |
3.0: | 0.3.1-alt2 |
Группа :: Графические оболочки/XFce
Пакет: xfce4-datetime-plugin
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: xfce4-datetime-plugin-0.6.1-alt-port-to-libxfce4ui.patch
Скачать
Скачать
diff --git a/configure.in b/configure.in
index 0bda629..8faa6ff 100644
--- a/configure.in
+++ b/configure.in
@@ -30,8 +30,8 @@ dnl Check for i18n support
XDT_I18N([ar da el en_GB es eu fr gl hu ja lv nl pt_BR pt_PT tr uk ur])
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 0a6f395..18bbc7e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -14,7 +14,7 @@ libdatetime_la_CFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
$(GTK_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
- $(LIBXFCEGUI4_CFLAGS) \
+ $(LIBXFCE4UI_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
libdatetime_la_LDFLAGS = \
@@ -29,7 +29,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 fe2bc9a..0bccfc3 100644
--- a/panel-plugin/datetime-dialog.c
+++ b/panel-plugin/datetime-dialog.c
@@ -28,9 +28,9 @@
#include <string.h>
/* xfce includes */
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
#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 c534d6c..f56df5a 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -28,10 +28,9 @@
#include <string.h>
/* xfce includes */
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4util/libxfce4util.h>
-#include <libxfce4panel/xfce-panel-plugin.h>
-#include <libxfce4panel/xfce-panel-convenience.h>
+#include <libxfce4panel/libxfce4panel.h>
#include "datetime.h"
#include "datetime-dialog.h"