[Xfce4-commits] r23755 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Author: stephan
Date: 2006-11-06 09:25:13 + (Mon, 06 Nov 2006)
New Revision: 23755
Added:
xarchiver/branches/xarchiver-psybsd/src/application.c
xarchiver/branches/xarchiver-psybsd/src/application.h
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
xarchiver/branches/xarchiver-psybsd/src/Makefile.am
xarchiver/branches/xarchiver-psybsd/src/main_window.c
xarchiver/branches/xarchiver-psybsd/src/main_window.h
xarchiver/branches/xarchiver-psybsd/src/notebook.c
xarchiver/branches/xarchiver-psybsd/src/notebook.h
xarchiver/branches/xarchiver-psybsd/src/settings.c
Log:
added 'application' class.
made settings object a singleton.
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
===
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
2006-11-06 09:16:58 UTC (rev 23754)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/internals.c
2006-11-06 09:25:13 UTC (rev 23755)
@@ -165,7 +165,5 @@
_filenames = _filenames-next;
LXA_FREE(_concat_str);
}
- if(!filenames)
- return NULL;
return concat_str;
}
Modified: xarchiver/branches/xarchiver-psybsd/src/Makefile.am
===
--- xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-11-06 09:16:58 UTC
(rev 23754)
+++ xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-11-06 09:25:13 UTC
(rev 23755)
@@ -15,6 +15,7 @@
xarchiver_SOURCES = \
main.c main.h \
+ application.c application.h \
main_window.c main_window.h \
navigation_bar.c navigation_bar.h \
notebook.c notebook.h \
Added: xarchiver/branches/xarchiver-psybsd/src/application.c
===
--- xarchiver/branches/xarchiver-psybsd/src/application.c
(rev 0)
+++ xarchiver/branches/xarchiver-psybsd/src/application.c 2006-11-06
09:25:13 UTC (rev 23755)
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2006 Stephan Arts [EMAIL PROTECTED]
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include config.h
+#include string.h
+#include glib.h
+#include gtk/gtk.h
+#include libxarchiver/libxarchiver.h
+#include settings.h
+#include archive_store.h
+#include navigation_bar.h
+#include main_window.h
+#include application.h
+
+static void
+xa_application_class_init(XAApplicationClass *archive_class);
+
+static void
+xa_application_init(XAApplication *archive);
+static void
+xa_application_finalize(GObject *object);
+
+/* properties */
+enum {
+ XA_APPLICATION_NAV_HISTORY = 1
+};
+
+GType
+xa_application_get_type ()
+{
+ static GType xa_application_type = 0;
+
+ if (!xa_application_type)
+ {
+ static const GTypeInfo xa_application_info =
+ {
+ sizeof (XAApplicationClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) xa_application_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (XAApplication),
+ 0,
+ (GInstanceInitFunc) xa_application_init,
+ NULL
+ };
+
+ xa_application_type = g_type_register_static
(GTK_TYPE_CONTAINER, XAApplication, xa_application_info, 0);
+ }
+ return xa_application_type;
+}
+
+static void
+xa_application_class_init(XAApplicationClass *application_class)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (application_class);
+ object_class-finalize = xa_application_finalize;
+}
+
+static void
+xa_application_init(XAApplication *application)
+{
+}
+
+static void
+xa_application_finalize(GObject *object)
+{
+}
+
+XAApplication *
+xa_application_new(GtkIconTheme *icon_theme)
+{
+ XAApplication *app;
+
+ app = g_object_new(XA_TYPE_APPLICATION, NULL);
+
+ app-icon_theme = icon_theme;
+
+ return app;
+}
+
+GtkWidget *
+xa_application_new_window(XAApplication *app)
+{
+ return xa_main_window_new(app-icon_theme);
+}
[Xfce4-commits] r23762 - in terminal/trunk: . terminal
Author: benny Date: 2006-11-06 19:09:43 + (Mon, 06 Nov 2006) New Revision: 23762 Modified: terminal/trunk/ChangeLog terminal/trunk/configure.in.in terminal/trunk/terminal/Makefile.am Log: 2006-11-06 Benedikt Meurer [EMAIL PROTECTED] * configure.in.in, terminal/Makefile.am: Fix installation on case insensitive file systems. Bug #2526. Modified: terminal/trunk/ChangeLog === --- terminal/trunk/ChangeLog2006-11-06 18:38:00 UTC (rev 23761) +++ terminal/trunk/ChangeLog2006-11-06 19:09:43 UTC (rev 23762) @@ -1,3 +1,8 @@ +2006-11-06 Benedikt Meurer [EMAIL PROTECTED] + + * configure.in.in, terminal/Makefile.am: Fix installation on case + insensitive file systems. Bug #2526. + 2006-11-04 Benedikt Meurer [EMAIL PROTECTED] * configure.in.in: Post-release version bump. Modified: terminal/trunk/configure.in.in === --- terminal/trunk/configure.in.in 2006-11-06 18:38:00 UTC (rev 23761) +++ terminal/trunk/configure.in.in 2006-11-06 19:09:43 UTC (rev 23762) @@ -55,21 +55,6 @@ AC_ISC_POSIX() dnl -dnl *** Check for Win32 variants *** -dnl -AC_MSG_CHECKING([if building for some Win32 platform]) -case $host in -*-*-mingw*|*-*-cygwin*) - ac_bm_platform_win32=yes - ;; -*) - ac_bm_platform_win32=no - ;; -esac -AC_MSG_RESULT([$ac_bm_platform_win32]) -AM_CONDITIONAL([PLATFORM_WIN32], [test x$ac_bm_platform_win32 = xyes]) - -dnl dnl *** Check for basic programs *** dnl AC_PROG_CC() Modified: terminal/trunk/terminal/Makefile.am === --- terminal/trunk/terminal/Makefile.am 2006-11-06 18:38:00 UTC (rev 23761) +++ terminal/trunk/terminal/Makefile.am 2006-11-06 19:09:43 UTC (rev 23762) @@ -85,12 +85,10 @@ $(VTE_LIBS) \ $(TERMINAL_LIBS) -if !PLATFORM_WIN32 # install symlink to 'terminal' install-data-local: $(mkinstalldirs) $(DESTDIR)$(bindir) - ( cd $(DESTDIR)$(bindir) ; ln -sf Terminal terminal ) -endif + -( cd $(DESTDIR)$(bindir) ; ln -sf Terminal terminal ) if HAVE_DBUS Terminal_CFLAGS += \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23763 - in thunar/trunk: . thunar
Author: benny Date: 2006-11-06 19:10:39 + (Mon, 06 Nov 2006) New Revision: 23763 Modified: thunar/trunk/ChangeLog thunar/trunk/configure.in.in thunar/trunk/thunar/Makefile.am Log: 2006-11-06 Benedikt Meurer [EMAIL PROTECTED] * configure.in.in, thunar/Makefile.am: Fix installation on case insensitive file systems. Bug #2521. Modified: thunar/trunk/ChangeLog === --- thunar/trunk/ChangeLog 2006-11-06 19:09:43 UTC (rev 23762) +++ thunar/trunk/ChangeLog 2006-11-06 19:10:39 UTC (rev 23763) @@ -1,5 +1,10 @@ 2006-11-06 Benedikt Meurer [EMAIL PROTECTED] + * configure.in.in, thunar/Makefile.am: Fix installation on case + insensitive file systems. Bug #2521. + +2006-11-06 Benedikt Meurer [EMAIL PROTECTED] + * thunar/thunar-path-entry.c(thunar_path_entry_changed): Changing the model currently in used by a GtkEntryCompletion is very slow with recent GTK+ versions. Therefore we disconnect the model first when Modified: thunar/trunk/configure.in.in === --- thunar/trunk/configure.in.in2006-11-06 19:09:43 UTC (rev 23762) +++ thunar/trunk/configure.in.in2006-11-06 19:10:39 UTC (rev 23763) @@ -50,21 +50,6 @@ AC_MINIX() dnl -dnl *** Check for Win32 variants *** -dnl -AC_MSG_CHECKING([if building for some Win32 platform]) -case $host in -*-*-mingw*|*-*-cygwin*) - ac_bm_platform_win32=yes - ;; -*) - ac_bm_platform_win32=no - ;; -esac -AC_MSG_RESULT([$ac_bm_platform_win32]) -AM_CONDITIONAL([PLATFORM_WIN32], [test x$ac_bm_platform_win32 = xyes]) - -dnl dnl *** Check for basic programs *** dnl AC_PROG_CC() Modified: thunar/trunk/thunar/Makefile.am === --- thunar/trunk/thunar/Makefile.am 2006-11-06 19:09:43 UTC (rev 23762) +++ thunar/trunk/thunar/Makefile.am 2006-11-06 19:10:39 UTC (rev 23763) @@ -230,12 +230,10 @@ $(DBUS_LIBS) endif -if !PLATFORM_WIN32 # install symlink to 'thunar' install-data-local: $(mkinstalldirs) $(DESTDIR)$(bindir) - ( cd $(DESTDIR)$(bindir) ; ln -sf Thunar thunar ) -endif + -( cd $(DESTDIR)$(bindir) ; ln -sf Thunar thunar ) clean-local: rm -f *.core core core.* ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23764 - libfrap/trunk/libfrap/menu
Author: jannis
Date: 2006-11-06 21:19:40 + (Mon, 06 Nov 2006)
New Revision: 23764
Modified:
libfrap/trunk/libfrap/menu/ChangeLog
libfrap/trunk/libfrap/menu/frap-menu-item-cache.c
libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
libfrap/trunk/libfrap/menu/frap-menu.c
Log:
* frap-menu.c, frap-menu-standard-rules.c, frap-menu-item-pool.c,
frap-menu-item-cache.c: Apply patch by Jannis Pohlmann which makes
FrapMenu compatible with GLib 2.12.
Modified: libfrap/trunk/libfrap/menu/ChangeLog
===
--- libfrap/trunk/libfrap/menu/ChangeLog2006-11-06 19:10:39 UTC (rev
23763)
+++ libfrap/trunk/libfrap/menu/ChangeLog2006-11-06 21:19:40 UTC (rev
23764)
@@ -1,3 +1,9 @@
+2006-11-06 Jannis Pohlmann [EMAIL PROTECTED]
+
+ * frap-menu.c, frap-menu-standard-rules.c, frap-menu-item-pool.c,
+ frap-menu-item-cache.c: Apply patch by Jannis Pohlmann which makes
+ FrapMenu compatible with GLib 2.12.
+
2006-11-03 Jannis Pohlmann [EMAIL PROTECTED]
* frap-menu.{c,h}, frap-menu-move.{c,h}, Makefile.am, STATUS:
Modified: libfrap/trunk/libfrap/menu/frap-menu-item-cache.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-cache.c 2006-11-06 19:10:39 UTC
(rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-cache.c 2006-11-06 21:19:40 UTC
(rev 23764)
@@ -1,5 +1,5 @@
/* $Id$ */
-/* vi:set expandtab sw=2 sts=2: */
+/* vi:set expandtab sw=2 sts=2 et: */
/*-
* Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
*
@@ -39,10 +39,10 @@
#include string.h
#endif
+#include libxfce4util/libxfce4util.h
+
#include tdb/tdb.h
-#include libxfce4util/libxfce4util.h
-
#include frap-menu-item.h
#include frap-menu-item-cache.h
@@ -214,7 +214,11 @@
FrapMenuItemCache *cache = FRAP_MENU_ITEM_CACHE (object);
/* Free hash table */
+#if GLIB_CHECK_VERSION(2,10,0)
g_hash_table_unref (cache-priv-items);
+#else
+ g_hash_table_destroy (cache-priv-items);
+#endif
/* Close TDB database */
if (G_LIKELY (cache-priv-context != NULL))
Modified: libfrap/trunk/libfrap/menu/frap-menu-item-pool.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-06 19:10:39 UTC
(rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-item-pool.c2006-11-06 21:19:40 UTC
(rev 23764)
@@ -127,7 +127,11 @@
{
FrapMenuItemPool *pool = FRAP_MENU_ITEM_POOL (object);
+#if GLIB_CHECK_VERSION(2,10,0)
g_hash_table_unref (pool-priv-items);
+#else
+ g_hash_table_destroy (pool-priv-items);
+#endif
(*G_OBJECT_CLASS (frap_menu_item_pool_parent_class)-finalize) (object);
}
@@ -195,7 +199,11 @@
/* If rules are empty, remove all items */
if (G_UNLIKELY (g_slist_length (rules) == 0))
+#if GLIB_CHECK_VERSION(2,12,0)
g_hash_table_remove_all (pool-priv-items);
+#else
+g_hash_table_foreach_remove (pool-priv-items, (GHRFunc) g_object_unref,
NULL);
+#endif
else
g_hash_table_foreach_remove (pool-priv-items, (GHRFunc)
frap_menu_item_pool_filter_item, rules);
}
Modified: libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c
===
--- libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c 2006-11-06
19:10:39 UTC (rev 23763)
+++ libfrap/trunk/libfrap/menu/frap-menu-standard-rules.c 2006-11-06
21:19:40 UTC (rev 23764)
@@ -235,7 +235,11 @@
g_return_if_fail (FRAP_IS_MENU_RULES (additional_rules));
/* Remove floating reference (if any) and request a normal one */
+#if GLIB_CHECK_VERSION(2,10,0)
g_object_ref_sink (G_OBJECT (additional_rules));
+#else
+ g_object_ref (G_OBJECT (additional_rules));
+#endif
/* Append rules to the list */
std_rules-rules = g_list_append (std_rules-rules, additional_rules);
Modified: libfrap/trunk/libfrap/menu/frap-menu.c
===
--- libfrap/trunk/libfrap/menu/frap-menu.c 2006-11-06 19:10:39 UTC (rev
23763)
+++ libfrap/trunk/libfrap/menu/frap-menu.c 2006-11-06 21:19:40 UTC (rev
23764)
@@ -1,5 +1,5 @@
/* $Id$ */
-/* vi:set expandtab sw=2 sts=2: */
+/* vi:set expandtab sw=2 sts=2 et: */
/*-
* Copyright (c) 2006 Jannis Pohlmann [EMAIL PROTECTED]
*
@@ -750,7 +750,11 @@
g_object_unref (menu-priv-directory);
/* Remove the floating reference and acquire a normal one */
+#if GLIB_CHECK_VERSION(2,10,0)
g_object_ref_sink (G_OBJECT (directory));
+#else
+ g_object_ref (G_OBJECT (directory));
+#endif
/* Set the new directory */
menu-priv-directory = directory;
@@ -1602,7 +1606,11 @@
g_return_if_fail (FRAP_IS_MENU (submenu));
/* Remove floating reference and acquire a 'real' one */
+#if GLIB_CHECK_VERSION (2,10,0)
g_object_ref_sink (G_OBJECT
[Xfce4-commits] r23765 - xarchiver/trunk/po
Author: piarres Date: 2006-11-06 21:59:53 + (Mon, 06 Nov 2006) New Revision: 23765 Modified: xarchiver/trunk/po/ChangeLog xarchiver/trunk/po/eu.po Log: Xarchiver basque translation update Modified: xarchiver/trunk/po/ChangeLog === --- xarchiver/trunk/po/ChangeLog2006-11-06 21:19:40 UTC (rev 23764) +++ xarchiver/trunk/po/ChangeLog2006-11-06 21:59:53 UTC (rev 23765) @@ -1,3 +1,7 @@ +2006-11-06 Piarres Beobide [EMAIL PROTECTED] + +* eu.po: Basque translation update. + 2006-11-05 Pau Rul-lan Ferragut [EMAIL PROTECTED] * de.po: Updated German translations by Enrico Tröger Modified: xarchiver/trunk/po/eu.po === --- xarchiver/trunk/po/eu.po2006-11-06 21:19:40 UTC (rev 23764) +++ xarchiver/trunk/po/eu.po2006-11-06 21:59:53 UTC (rev 23765) @@ -7,10 +7,10 @@ # Piarres Beobide [EMAIL PROTECTED], 2006. msgid msgstr -Project-Id-Version: xarchiver 0.4.2rc2\n +Project-Id-Version: eu\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2006-11-06 13:47+0100\n -PO-Revision-Date: 2006-11-02 23:09+0100\n +PO-Revision-Date: 2006-11-06 23:00+0100\n Last-Translator: Piarres Beobide [EMAIL PROTECTED]\n Language-Team: librezale [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -129,23 +129,19 @@ #: src/add_dialog.c:211 msgid 0 = no compression, 5 is default, 9 = best compression but slowest -msgstr -0 = konpresiorik ez, 5 lehenetsia, 9 = konpresio hoberen baina geldoena +msgstr 0 = konpresiorik ez, 5 lehenetsia, 9 = konpresio hoberen baina geldoena #: src/add_dialog.c:218 msgid 0 = no compression, 6 is default, 9 = best compression but slowest -msgstr -0 = konpresiorik ez, 6 lehenetsia, 9 = konpresio hoberen baina geldoena +msgstr 0 = konpresiorik ez, 6 lehenetsia, 9 = konpresio hoberen baina geldoena #: src/add_dialog.c:225 msgid 0 = no compression, 3 is default, 5 = best compression but slowest -msgstr -0 = konpresiorik ez, 3 lehenetsia, 5 = konpresio hoberen baina geldoena +msgstr 0 = konpresiorik ez, 3 lehenetsia, 5 = konpresio hoberen baina geldoena #: src/add_dialog.c:232 msgid 0 = no compression, 1 is default, 4 = fastest but least compression -msgstr -0 = konpresiorik ez, 1 lehenetsia, 4 = azkarren baina konpresio gutxiena +msgstr 0 = konpresiorik ez, 1 lehenetsia, 4 = azkarren baina konpresio gutxiena #: src/add_dialog.c:239 msgid 5 = default compression, 7 = max compression @@ -268,8 +264,7 @@ #: src/callbacks.c:131 #, c-format msgid Please check \%s\ since some files could have been already extracted. -msgstr -Mesedez egiaztatu \%s\ zenbait fitxategi ateratak izan dira dagoeneko eta. +msgstr Mesedez egiaztatu \%s\ zenbait fitxategi ateratak izan dira dagoeneko eta. #: src/callbacks.c:155 src/callbacks.c:1975 msgid An error occurred while accessing the archive. @@ -334,9 +329,8 @@ msgstr Prest. #: src/callbacks.c:554 -#, fuzzy msgid Please hit the Stop button first! -msgstr Mesedez lehenengo pasahitza idatz ezazu! +msgstr Mesedez lehenengo Gelditu botoia jo! #: src/callbacks.c:590 #, c-format @@ -417,8 +411,7 @@ msgstr Errore bat gertatu ikusteko fitxategia ateratzerakoan: #: src/callbacks.c:1623 -msgid -An error occurred while converting the file content to the UTF8 encoding: +msgid An error occurred while converting the file content to the UTF8 encoding: msgstr Errore bat gertatu da pakete edukia UTF8 kodeketara bihurtzean: #: src/callbacks.c:1679 @@ -514,10 +507,8 @@ msgstr Fitxategia bide osoarekin atera #: src/extract_dialog.c:173 -msgid -The archive's directory structure is recreated in the extraction directory. -msgstr -Paketearen direktorio egitura birsortua izango da ateratze direktorioan. +msgid The archive's directory structure is recreated in the extraction directory. +msgstr Paketearen direktorio egitura birsortua izango da ateratze direktorioan. #: src/extract_dialog.c:178 msgid Touch files @@ -613,12 +604,11 @@ #: src/lha.c:40 msgid UID/GID -msgstr +msgstr UID/GID #: src/lha.c:40 -#, fuzzy msgid Timestamp -msgstr Ordua +msgstr Datamarka #: src/interface.c:73 msgid _File @@ -700,8 +690,7 @@ msgid Extract files from the current archive; use the mouse to select files individually -msgstr -Uneko paketetik fitxategiak atera; sagua erabili fitxategiak hautatzeko +msgstr Uneko paketetik fitxategiak atera; sagua erabili fitxategiak hautatzeko #: src/interface.c:295 msgid SFX @@ -919,31 +908,28 @@ #: src/new_dialog.c:49 msgid Cr_eate -msgstr +msgstr Sort_u #: src/new_dialog.c:86 -#, fuzzy msgid Archive type: -msgstr Pakete tamaina: +msgstr Pakete mota: #: src/new_dialog.c:91 msgid Choose the archive type to create -msgstr +msgstr Hautatu sortu behar den pakete mota #: src/new_dialog.c:109 -#, fuzzy msgid Add the archive extension to the filename -msgstr Paketera fitxategiak gehitu fitxategi izenak galdetuz eta irten. +msgstr
[Xfce4-commits] r23766 - xfwm4/trunk/src
Author: olivier
Date: 2006-11-06 21:59:55 + (Mon, 06 Nov 2006)
New Revision: 23766
Modified:
xfwm4/trunk/src/hints.c
Log:
Fix compilation with --enable-kde-systray (bug #2511).
Modified: xfwm4/trunk/src/hints.c
===
--- xfwm4/trunk/src/hints.c 2006-11-06 21:59:53 UTC (rev 23765)
+++ xfwm4/trunk/src/hints.c 2006-11-06 21:59:55 UTC (rev 23766)
@@ -1140,11 +1140,11 @@
ev.type = ClientMessage;
ev.message_type = atom;
ev.format = 32;
-ev.data.l[0] = server_time;
-ev.data.l[1] = atom;
-ev.data.l[2] = w;
-ev.data.l[3] = 0;
-ev.data.l[4] = 0;
+ev.data.l[0] = (long) server_time;
+ev.data.l[1] = (long) atom;
+ev.data.l[2] = (long) w;
+ev.data.l[3] = (long) 0L;
+ev.data.l[4] = (long) 0L;
ev.window = root;
XSendEvent (display_info-dpy, root, FALSE, StructureNotifyMask,
(XEvent *) ev);
@@ -1220,21 +1220,29 @@
int actual_format;
unsigned long nitems;
unsigned long bytes_after;
+unsigned char *data;
Window trayIconForWindow;
-TRACE (entering GetWindowRole);
+TRACE (entering checkKdeSystrayWindow);
g_return_val_if_fail (window != None, FALSE);
XGetWindowProperty(display_info-dpy, window,
display_info-atoms[KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR],
0L, sizeof(Window), FALSE, XA_WINDOW, actual_type,
actual_format,
- nitems, bytes_after, (unsigned char **)
trayIconForWindow);
+ nitems, bytes_after, (unsigned char **) data);
+trayIconForWindow = *((Window *) data);
+if (data)
+{
+XFree (data);
+}
+
if ((actual_format == None) ||
(actual_type != XA_WINDOW) ||
(trayIconForWindow == None))
{
return FALSE;
}
+
return TRUE;
}
@@ -1251,11 +1259,11 @@
xev.window = systray;
xev.message_type = display_info-atoms[NET_SYSTEM_TRAY_OPCODE];
xev.format = 32;
-xev.data.l[0] = myDisplayGetCurrentTime (screen_info);
-xev.data.l[1] = 0; /* SYSTEM_TRAY_REQUEST_DOCK */
-xev.data.l[2] = window;
-xev.data.l[3] = 0; /* Nada */
-xev.data.l[4] = 0; /* Niet */
+xev.data.l[0] = (long) myDisplayGetCurrentTime (display_info);
+xev.data.l[1] = (long) 0L; /* SYSTEM_TRAY_REQUEST_DOCK */
+xev.data.l[2] = (long) window;
+xev.data.l[3] = (long) 0L; /* Nada */
+xev.data.l[4] = (long) 0L; /* Niet */
XSendEvent (display_info-dpy, systray, FALSE, NoEventMask, (XEvent *)
xev);
}
@@ -1341,11 +1349,11 @@
xev.window = window;
xev.message_type = display_info-atoms[WM_PROTOCOLS];
xev.format = 32;
-xev.data.l[0] = display_info-atoms[NET_WM_SYNC_REQUEST];
-xev.data.l[1] = CurrentTime;
-xev.data.l[2] = XSyncValueLow32 (value);
-xev.data.l[3] = XSyncValueHigh32 (value);
-xev.data.l[4] = 0;
+xev.data.l[0] = (long) display_info-atoms[NET_WM_SYNC_REQUEST];
+xev.data.l[1] = (long) myDisplayGetCurrentTime (display_info);
+xev.data.l[2] = (long) XSyncValueLow32 (value);
+xev.data.l[3] = (long) XSyncValueHigh32 (value);
+xev.data.l[4] = (long) 0L;
XSendEvent (display_info-dpy, window, FALSE, NoEventMask, (XEvent *)
xev);
}
#endif /* HAVE_XSYNC */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r23767 - xfwm4/trunk/src
Author: olivier
Date: 2006-11-06 22:03:38 + (Mon, 06 Nov 2006)
New Revision: 23767
Modified:
xfwm4/trunk/src/transients.c
xfwm4/trunk/src/workspaces.c
Log:
Check for valid transient or modal when switching workspaces, to avoid missing
windows to unmap (bug #2518).
Modified: xfwm4/trunk/src/transients.c
===
--- xfwm4/trunk/src/transients.c2006-11-06 21:59:55 UTC (rev 23766)
+++ xfwm4/trunk/src/transients.c2006-11-06 22:03:38 UTC (rev 23767)
@@ -61,7 +61,10 @@
g_return_val_if_fail (c != NULL, FALSE);
TRACE (entering clientIsModal);
-
+/*
+ If the WM_TRANSIENT_FOR hint is set to another toplevel window, the
dialog is modal for that window;
+ if WM_TRANSIENT_FOR is not set or set to the root window the dialog is
modal for its window group.
+ */
return (FLAG_TEST (c-flags, CLIENT_FLAG_STATE_MODAL) (c-type
WINDOW_REGULAR_FOCUSABLE)
(((c-transient_for != c-screen_info-xroot) (c-transient_for
!= None) (c-transient_for != c-window)) ||
((c-group_leader != None) (c-group_leader != c-window;
Modified: xfwm4/trunk/src/workspaces.c
===
--- xfwm4/trunk/src/workspaces.c2006-11-06 21:59:55 UTC (rev 23766)
+++ xfwm4/trunk/src/workspaces.c2006-11-06 22:03:38 UTC (rev 23767)
@@ -305,9 +305,9 @@
}
else if (c-win_workspace == new_ws)
{
-if (!FLAG_TEST (c-flags, CLIENT_FLAG_ICONIFIED))
+if (!FLAG_TEST (c-flags, CLIENT_FLAG_ICONIFIED) !FLAG_TEST
(c-xfwm_flags, XFWM_FLAG_VISIBLE))
{
-if (!clientIsTransientOrModal (c))
+if (!clientIsTransientOrModal (c) ||
!clientTransientOrModalHasAncestor (c, new_ws))
{
clientShow (c, FALSE);
}
@@ -329,7 +329,7 @@
}
if (FLAG_TEST (c-xfwm_flags, XFWM_FLAG_VISIBLE) !FLAG_TEST
(c-flags, CLIENT_FLAG_STICKY))
{
-if (!clientIsTransientOrModal (c))
+if (!clientIsTransientOrModal (c) ||
!clientTransientOrModalHasAncestor (c, new_ws))
{
clientHide (c, new_ws, FALSE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
