[Xfce4-commits] <xfwm4:master> Initial commit for removing libxfcegui4 dependency

[Stephan Arts]

Updating branch refs/heads/master
         to cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7 (commit)
       from de6a5ecfc44f0ae5aa28ffcba5bd132cb55507ca (commit)

commit cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Aug 25 00:15:42 2009 +0200

    Initial commit for removing libxfcegui4 dependency

 configure.ac.in                               |    8 ++++----
 settings-dialogs/tweaks-settings.c            |    2 +-
 settings-dialogs/workspace-settings.c         |    4 ++--
 settings-dialogs/xfwm4-settings.c             |    2 +-
 settings-dialogs/xfwm4-tweaks-dialog.glade    |    2 +-
 settings-dialogs/xfwm4-workspace-dialog.glade |    2 +-
 src/display.h                                 |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index ba80155..db37a16 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -12,8 +12,8 @@ m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_ve
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
-m4_define([libxfcegui4_minimum_version], [4.6.0])
-m4_define([libxfce4kbd_private_minimum_version], [4.6.0])
+m4_define([libxfce4ui_minimum_version], [4.7.0])
+m4_define([libxfce4kbd_private_minimum_version], [4.7.0])
 m4_define([xfconf_minimum_version], [4.6.0])
 m4_define([xcomposite_minimum_version], [0.2])
 m4_define([wnck_minimum_version], [2.12])
@@ -72,8 +72,8 @@ AC_CHECK_LIB([Xext], [XShapeCombineShape],
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
 XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [xfce_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], libxfcegui4-1.0, [libxfcegui4_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-1.0, [libxfce4kbd_private_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], libxfce4ui-1, [libxfce4ui_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], libxfce4kbd-private-2, [libxfce4kbd_private_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCONF], libxfconf-0, [xfconf_minimum_version])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 8425c73..c5f2696 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -39,7 +39,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
 #include "xfwm4-tweaks-dialog_glade.h"
 
diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c
index ee69a1e..4792f55 100644
--- a/settings-dialogs/workspace-settings.c
+++ b/settings-dialogs/workspace-settings.c
@@ -31,7 +31,7 @@
 #include <libwnck/libwnck.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
 #include "xfwm4-workspace-dialog_glade.h"
 #include "monitor-icon.h"
@@ -311,7 +311,7 @@ workspace_dialog_configure_widgets (GladeXML *gxml,
     GtkWidget *margin_left_spinbutton = glade_xml_get_widget (gxml, "margin_left_spinbutton");
 
     /* Set monitor icon */
-    monitor = xfce_inline_icon_at_size (monitor_icon_data, -1, -1);
+    monitor = gdk_pixbuf_new_from_inline (sizeof (*monitor_icon_data), monitor_icon_data, TRUE, NULL);
     image = glade_xml_get_widget (gxml, "monitor_icon");
     gtk_image_set_from_pixbuf (GTK_IMAGE (image), monitor);
     g_object_unref (monitor);
diff --git a/settings-dialogs/xfwm4-settings.c b/settings-dialogs/xfwm4-settings.c
index f8a0ca4..d8cda2a 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -40,7 +40,7 @@
 #include <glade/glade.h>
 
 #include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 #include <xfconf/xfconf.h>
 #include <libxfce4kbd-private/xfce-shortcut-dialog.h>
 #include <libxfce4kbd-private/xfce-shortcuts-provider.h>
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 2e2b9ff..19a520e 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -2,7 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
 <!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:59 2008 -->
 <glade-interface>
-  <requires lib="xfce4"/>
+  <requires lib="libxfce4ui"/>
   <widget class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Window Manager Tweaks</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
diff --git a/settings-dialogs/xfwm4-workspace-dialog.glade b/settings-dialogs/xfwm4-workspace-dialog.glade
index 513275e..e69fdbc 100644
--- a/settings-dialogs/xfwm4-workspace-dialog.glade
+++ b/settings-dialogs/xfwm4-workspace-dialog.glade
@@ -2,7 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
 <!--Generated with glade3 3.4.5 on Fri Oct 31 11:02:28 2008 -->
 <glade-interface>
-  <requires lib="xfce4"/>
+  <requires lib="libxfce4ui"/>
   <widget class="XfceTitledDialog" id="main-dialog">
     <property name="title" translatable="yes">Workspaces</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
diff --git a/src/display.h b/src/display.h
index 12ada09..e3e6178 100644
--- a/src/display.h
+++ b/src/display.h
@@ -63,7 +63,7 @@
 
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
 
 #include "event_filter.h"