Author: stephan
Date: 2008-06-03 17:45:59 +0000 (Tue, 03 Jun 2008)
New Revision: 27022
Modified:
xfce4-session/trunk/configure.in.in
xfce4-session/trunk/xfce4-session/Makefile.am
xfce4-session/trunk/xfce4-session/shutdown.c
xfce4-session/trunk/xfce4-session/xfsm-legacy.c
xfce4-session/trunk/xfce4-session/xfsm-manager.c
Log:
Apply patch from Nick, removing the netk dependency.
Add xfsm-* icons as fallback for the icon-naming-spec icons.
Modified: xfce4-session/trunk/configure.in.in
===================================================================
--- xfce4-session/trunk/configure.in.in 2008-06-03 17:37:37 UTC (rev 27021)
+++ xfce4-session/trunk/configure.in.in 2008-06-03 17:45:59 UTC (rev 27022)
@@ -72,6 +72,7 @@
dnl Check for required packages
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
dnl Check for D-Bus support (for HAL shutdown support)
XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-1], [0.34], [dbus],
Modified: xfce4-session/trunk/xfce4-session/Makefile.am
===================================================================
--- xfce4-session/trunk/xfce4-session/Makefile.am 2008-06-03 17:37:37 UTC
(rev 27021)
+++ xfce4-session/trunk/xfce4-session/Makefile.am 2008-06-03 17:45:59 UTC
(rev 27022)
@@ -50,7 +50,9 @@
$(LIBX11_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(LIBWNCK_CFLAGS) \
-DDBUS_API_SUBJECT_TO_CHANGE \
+ -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-DLIBDIR=\"$(libdir)\" \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -64,6 +66,7 @@
$(LIBX11_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(DBUS_LIBS) \
+ $(LIBWNCK_LIBS) \
$(GNOME_LIBS)
xfce4_session_DEPENDENCIES = \
Modified: xfce4-session/trunk/xfce4-session/shutdown.c
===================================================================
--- xfce4-session/trunk/xfce4-session/shutdown.c 2008-06-03 17:37:37 UTC
(rev 27021)
+++ xfce4-session/trunk/xfce4-session/shutdown.c 2008-06-03 17:45:59 UTC
(rev 27022)
@@ -326,6 +326,8 @@
gtk_container_add (GTK_CONTAINER (logout_button), vbox2);
icon = xfce_themed_icon_load ("system-log-out", 32);
+ if (!icon)
+ icon = xfce_themed_icon_load ("xfsm-logout", 32);
image = gtk_image_new_from_pixbuf (icon);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
@@ -349,6 +351,8 @@
gtk_container_add (GTK_CONTAINER (reboot_button), vbox2);
icon = xfce_themed_icon_load ("system-reboot", 32);
+ if (!icon)
+ icon = xfce_themed_icon_load ("xfsm-reboot", 32);
image = gtk_image_new_from_pixbuf (icon);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
@@ -372,6 +376,8 @@
gtk_container_add (GTK_CONTAINER (halt_button), vbox2);
icon = xfce_themed_icon_load ("system-shutdown", 32);
+ if (!icon)
+ icon = xfce_themed_icon_load ("xfsm-shutdown", 32);
image = gtk_image_new_from_pixbuf (icon);
gtk_widget_show (image);
gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0);
Modified: xfce4-session/trunk/xfce4-session/xfsm-legacy.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-legacy.c 2008-06-03 17:37:37 UTC
(rev 27021)
+++ xfce4-session/trunk/xfce4-session/xfsm-legacy.c 2008-06-03 17:45:59 UTC
(rev 27022)
@@ -73,6 +73,8 @@
#include <libxfcegui4/libxfcegui4.h>
+#include <libwnck/libwnck.h>
+
#include <libxfsm/xfsm-util.h>
@@ -293,7 +295,7 @@
{
#ifdef LEGACY_SESSION_MANAGEMENT
XErrorHandler old_handler;
- NetkScreen *screen;
+ WnckScreen *screen;
GList *windows;
GList *lp;
Window leader;
@@ -331,14 +333,14 @@
/* query mapped windows on all screens */
for (n = 0; n < ScreenCount (gdk_display); ++n)
{
- screen = netk_screen_get (n);
- netk_screen_force_update (screen);
+ screen = wnck_screen_get (n);
+ wnck_screen_force_update (screen);
- windows = netk_screen_get_windows (screen);
+ windows = wnck_screen_get_windows (screen);
for (lp = windows; lp != NULL; lp = lp->next)
{
- window = netk_window_get_xid (NETK_WINDOW (lp->data));
+ window = wnck_window_get_xid (WNCK_WINDOW (lp->data));
leader = get_clientleader (window);
if (leader == None || sm_window_list_contains (leader)
|| has_xsmp_support (window) || has_xsmp_support (leader))
Modified: xfce4-session/trunk/xfce4-session/xfsm-manager.c
===================================================================
--- xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-06-03 17:37:37 UTC
(rev 27021)
+++ xfce4-session/trunk/xfce4-session/xfsm-manager.c 2008-06-03 17:45:59 UTC
(rev 27022)
@@ -48,6 +48,8 @@
#include <gdk-pixbuf/gdk-pixdata.h>
#include <gtk/gtk.h>
+#include <libwnck/libwnck.h>
+
#include <libxfcegui4/libxfcegui4.h>
#include <libxfsm/xfsm-splash-engine.h>
@@ -99,9 +101,9 @@
static void
xfsm_manager_restore_active_workspace (XfceRc *rc)
{
- NetkWorkspace *workspace;
+ WnckWorkspace *workspace;
GdkDisplay *display;
- NetkScreen *screen;
+ WnckScreen *screen;
gchar buffer[1024];
gint n, m;
@@ -113,13 +115,13 @@
continue;
m = xfce_rc_read_int_entry (rc, buffer, 0);
- screen = netk_screen_get (n);
- netk_screen_force_update (screen);
+ screen = wnck_screen_get (n);
+ wnck_screen_force_update (screen);
- if (netk_screen_get_workspace_count (screen) > m)
+ if (wnck_screen_get_workspace_count (screen) > m)
{
- workspace = netk_screen_get_workspace (screen, m);
- netk_workspace_activate (workspace);
+ workspace = wnck_screen_get_workspace (screen, m);
+ wnck_workspace_activate (workspace, GDK_CURRENT_TIME);
}
}
}
@@ -1137,9 +1139,9 @@
void
xfsm_manager_store_session (void)
{
- NetkWorkspace *workspace;
+ WnckWorkspace *workspace;
GdkDisplay *display;
- NetkScreen *screen;
+ WnckScreen *screen;
XfceRc *rc;
GList *lp;
gchar prefix[64];
@@ -1200,11 +1202,11 @@
display = gdk_display_get_default ();
for (n = 0; n < gdk_display_get_n_screens (display); ++n)
{
- screen = netk_screen_get (n);
- netk_screen_force_update (screen);
+ screen = wnck_screen_get (n);
+ wnck_screen_force_update (screen);
- workspace = netk_screen_get_active_workspace (screen);
- m = netk_workspace_get_number (workspace);
+ workspace = wnck_screen_get_active_workspace (screen);
+ m = wnck_workspace_get_number (workspace);
g_snprintf (prefix, 64, "Screen%d_ActiveWorkspace", n);
xfce_rc_write_int_entry (rc, prefix, m);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
