[Xfce4-commits] r26158 - in xfdesktop/trunk: . common menueditor modules/menu src
Brian Tarricone
kelnos at xfce.org
Sat Oct 20 21:10:14 CEST 2007
Author: kelnos
Date: 2007-10-20 19:10:14 +0000 (Sat, 20 Oct 2007)
New Revision: 26158
Added:
xfdesktop/trunk/menueditor/dummy_icon.h
Removed:
xfdesktop/trunk/modules/menu/desktop-menu-private.h
xfdesktop/trunk/modules/menu/desktop-menu.h
xfdesktop/trunk/modules/menu/dummy_icon.h
xfdesktop/trunk/src/main.h
Modified:
xfdesktop/trunk/ChangeLog
xfdesktop/trunk/common/desktop-menu-stub.c
xfdesktop/trunk/common/desktop-menu-stub.h
xfdesktop/trunk/menueditor/Makefile.am
xfdesktop/trunk/menueditor/menueditor-main-window.c
xfdesktop/trunk/modules/menu/Makefile.am
xfdesktop/trunk/modules/menu/desktop-menu.c
xfdesktop/trunk/src/Makefile.am
xfdesktop/trunk/src/main.c
xfdesktop/trunk/src/menu.c
xfdesktop/trunk/src/menu.h
xfdesktop/trunk/src/windowlist.c
xfdesktop/trunk/src/windowlist.h
xfdesktop/trunk/src/xfce-desktop.c
xfdesktop/trunk/src/xfce-desktop.h
xfdesktop/trunk/src/xfdesktop-marshal.list
Log:
Redo how the menu system works so i can support multiple menus on the
desktop propery. Instead of the old method, where main.c watched the
desktop for mouse clicks, not XfceDesktop does that, and emits two new
signals: populate-root-menu and populate-secondary-root-menu. Handlers
of these get passed a GtkMenu, which they should fill with menu items.
They can (optionally) check to see if the passed GtkMenu already has
menu items in it (put there by another handler) and put menu items in
a submenu of the passed item.
This cleaned up interfaces quite a bit and moved code to some more sane
locations. The semi-downside of this is that now XfceDesktopMenu needs
to generate a GtkMenu tree from the XfceMenu every time the menu has
popped up. Performance doesn't seem to be hurt too much on my system,
but it might be a problem for some really slow old hardware (but hopefully
not). The upside is that the full GtkMenu tree isn't kept around in
RAM all the time.
End-user behavior hasn't changed yet, but this will let me properly fix the
context menu for the desktop when file icons are enabled.
Modified: xfdesktop/trunk/ChangeLog
===================================================================
--- xfdesktop/trunk/ChangeLog 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/ChangeLog 2007-10-20 19:10:14 UTC (rev 26158)
@@ -1,3 +1,1053 @@
+2007-05-11 01:42 kelnos
+
+ * xfdesktop/trunk/settings/appearance-settings.c,
+ xfdesktop/trunk/src/xfce-backdrop.c,
+ xfdesktop/trunk/src/xfce-backdrop.h: add 'zoomed' option to
+ backdrop styles. this is a combination scaling/cropping mode
+ that ensures the backdrop image extends to every edge of the
+ screen without messing with the aspect ratio. patch from
+ trondsg at gmail.com (bug 3138)
+
+2007-05-05 18:10 kelnos
+
+ * xfdesktop/branches/xfce_4_4/NEWS,
+ xfdesktop/branches/xfce_4_4/panel-plugin/desktop-menu-plugin.c,
+ xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c: fix memleak
+ and 'too many open file descriptors' (missing xfce_rc_close())
+ (bug 3065)
+
+2007-05-05 14:55 majkl
+
+ * libexo/trunk/po/cs.po, squeeze/trunk/po/cs.po,
+ terminal/trunk/po/cs.po, xfburn/trunk/po/cs.po,
+ xfdesktop/trunk/po/cs.po: Updated Czech translations
+
+2007-04-11 19:55 erenturkay
+
+ * xfdesktop/branches/xfce_4_4/po/tr.po, xfdesktop/trunk/po/tr.po:
+ fix a very little mistake :(((
+
+2007-04-09 10:05 maximilian
+
+ * libexo/trunk/po-doc/fr.po, libexo/trunk/po/fr.po,
+ libxfce4util/branches/xfce_4_4/po/fr.po,
+ libxfce4util/trunk/po/fr.po,
+ libxfcegui4/branches/xfce_4_4/po/fr.po,
+ libxfcegui4/trunk/po/fr.po, mousepad/branches/xfce_4_4/po/fr.po,
+ mousepad/trunk/po/fr.po, squeeze/trunk/po/fr.po,
+ terminal/trunk/po-doc/ChangeLog, terminal/trunk/po-doc/fr.po,
+ terminal/trunk/po/fr.po, thunar/trunk/po-doc/fr.po,
+ thunar/trunk/po/fr.po, xarchiver/trunk/po/fr.po,
+ xfburn/trunk/po/fr.po, xfcalendar/branches/xfce_4_4/po/fr.po,
+ xfcalendar/trunk/po/fr.po,
+ xfce-mcs-manager/branches/xfce_4_4/po/fr.po,
+ xfce-mcs-manager/trunk/po/fr.po,
+ xfce-mcs-plugins/branches/xfce_4_4/po/fr.po,
+ xfce-mcs-plugins/trunk/po/fr.po,
+ xfce-utils/branches/xfce_4_4/po/fr.po,
+ xfce-utils/trunk/po/fr.po,
+ xfce4-appfinder/branches/xfce_4_4/po/fr.po,
+ xfce4-icon-theme/branches/xfce_4_4/po/fr.po,
+ xfce4-icon-theme/trunk/po/fr.po,
+ xfce4-panel/branches/xfce_4_4/po/fr.po,
+ xfce4-panel/trunk/po/fr.po,
+ xfce4-session/branches/xfce_4_4/po/fr.po,
+ xfce4-session/trunk/po/fr.po,
+ xfce4-trigger-launcher/trunk/po/fr.po,
+ xfdesktop/branches/xfce_4_4/po-doc/fr.po,
+ xfdesktop/branches/xfce_4_4/po/fr.po,
+ xfdesktop/trunk/po-doc/fr.po, xfdesktop/trunk/po/fr.po,
+ xfmedia/trunk/po/fr.po, xfprint/branches/xfce_4_4/po/fr.po,
+ xfprint/trunk/po/fr.po, xfwm4/branches/xfce_4_4/po/fr.po,
+ xfwm4/trunk/po/fr.po: * fr.po: Fixed typos and style in the
+ French translation of Terminal's manual * Changed my email
+ address in all the fr.po files in trunk and 4.4
+
+2007-04-08 10:40 daichi
+
+ * xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/POTFILES.in,
+ xfdesktop/trunk/po/POTFILES.skip, xfdesktop/trunk/po/ar.po,
+ xfdesktop/trunk/po/az.po, xfdesktop/trunk/po/be.po,
+ xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po,
+ xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po,
+ xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/dz.po,
+ xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po,
+ xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po,
+ xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po,
+ xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po,
+ xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po,
+ xfdesktop/trunk/po/gl.po, xfdesktop/trunk/po/gu.po,
+ xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po,
+ xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po,
+ xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po,
+ xfdesktop/trunk/po/ka.po, xfdesktop/trunk/po/ko.po,
+ xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mk.po,
+ xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po,
+ xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po,
+ xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po,
+ xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po,
+ xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po,
+ xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sq.po,
+ xfdesktop/trunk/po/sv.po, xfdesktop/trunk/po/ta.po,
+ xfdesktop/trunk/po/tr.po, xfdesktop/trunk/po/uk.po,
+ xfdesktop/trunk/po/vi.po, xfdesktop/trunk/po/xfdesktop.pot,
+ xfdesktop/trunk/po/zh_CN.po, xfdesktop/trunk/po/zh_TW.po: *
+ POTFILES.in: Removed panel-plugin/xfce4-menu.desktop.in, added
+ panel-plugin/xfce4-menu.desktop.in.in. * POTFILES.skip: Added. *
+ ar.po: Fixed errors. * ja.po: Updated Japanese translations. *
+ *.po: Updated.
+
+2007-04-07 22:07 maximilian
+
+ * squeeze/trunk/po/ChangeLog, squeeze/trunk/po/fr.po,
+ xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/fr.po,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/Makefile.am,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/root_menu.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/root_menu2.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/select_bg_color.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-appearance-tab.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-background.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-behavior-tab.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-editor.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-list.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/images/xfdesktop-menu-tab.png,
+ xfdesktop/branches/xfce_4_4/doc/fr/xfdesktop.html,
+ xfdesktop/branches/xfce_4_4/doc/fr/xfdesktop.xml.in,
+ xfdesktop/branches/xfce_4_4/po-doc/ChangeLog,
+ xfdesktop/branches/xfce_4_4/po-doc/fr.po,
+ xfdesktop/branches/xfce_4_4/po-doc/xfdesktop.pot,
+ xfdesktop/trunk/doc/fr/images/Makefile.am,
+ xfdesktop/trunk/doc/fr/images/root_menu.png,
+ xfdesktop/trunk/doc/fr/images/root_menu2.png,
+ xfdesktop/trunk/doc/fr/images/select_bg_color.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-appearance-tab.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-background.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-behavior-tab.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-editor.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-list.png,
+ xfdesktop/trunk/doc/fr/images/xfdesktop-menu-tab.png,
+ xfdesktop/trunk/doc/fr/xfdesktop.html,
+ xfdesktop/trunk/doc/fr/xfdesktop.xml.in,
+ xfdesktop/trunk/po-doc/ChangeLog, xfdesktop/trunk/po-doc/fr.po,
+ xfdesktop/trunk/po-doc/xfdesktop.pot, xfwm4/trunk/po/ChangeLog,
+ xfwm4/trunk/po/fr.po: Complete rewrite with updated images of
+ the French translation for Xfdesktop's manual, trunk and 4.4.
+ Updated some translations in trunk.
+
+2007-04-05 13:41 paurullan
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/ca.po,
+ libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/ca.po,
+ mousepad/trunk/po/ChangeLog, mousepad/trunk/po/ca.po,
+ terminal/trunk/po/ChangeLog, terminal/trunk/po/ca.po,
+ thunar/trunk/po/ChangeLog, thunar/trunk/po/ca.po,
+ xarchiver/trunk/po/ChangeLog, xarchiver/trunk/po/ca.po,
+ xfburn/trunk/po/ChangeLog, xfburn/trunk/po/ca.po,
+ xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/ca.po,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/ca.po,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/ca.po, xfce-utils/trunk/po/ChangeLog,
+ xfce-utils/trunk/po/ca.po, xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/ca.po, xfce4-mixer/trunk/po/ChangeLog,
+ xfce4-mixer/trunk/po/ca.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/ca.po, xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/ca.po,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/ca.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/ca.po,
+ xfmedia/trunk/po/ChangeLog, xfmedia/trunk/po/ca.po,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/ca.po: i18n catalan
+ update
+
+2007-04-01 09:15 maximilian
+
+ * xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/zh_CN.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/zh_CN.po:
+ Updated the Simplified Chinese translations for trunk.
+
+2007-03-31 07:43 kelnos
+
+ * xfdesktop/trunk/common/xfdesktop-common.c: most likely fix
+ problem with menu file not being found when it's in a prefix
+ that includes the user's homedir
+
+2007-03-30 08:54 maximilian
+
+ * xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/zh_CN.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/fr.po,
+ xfdesktop/trunk/po/zh_CN.po: Updated the Simplified Chinese
+ translations for Xfce 4.4
+
+2007-03-29 18:30 erenturkay
+
+ * xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/tr.po: update
+
+2007-03-28 20:51 maximilian
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/de.po,
+ libxfce4util/trunk/po/LINGUAS, mousepad/trunk/po/LINGUAS,
+ thunar/trunk/po/LINGUAS, xarchiver/trunk/po/ChangeLog,
+ xarchiver/trunk/po/LINGUAS, xarchiver/trunk/po/en_GB.po,
+ xfburn/trunk/po/ChangeLog, xfburn/trunk/po/LINGUAS,
+ xfburn/trunk/po/en_GB.po, xfcalendar/trunk/po/ChangeLog,
+ xfcalendar/trunk/po/de.po, xfcalendar/trunk/po/en_GB.po,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/de.po,
+ xfce-mcs-manager/trunk/po/en_GB.po,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/de.po,
+ xfce-mcs-plugins/trunk/po/en_GB.po,
+ xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/de.po,
+ xfce-utils/trunk/po/en_GB.po,
+ xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/de.po,
+ xfce4-appfinder/trunk/po/en_GB.po,
+ xfce4-icon-theme/trunk/po/ChangeLog,
+ xfce4-icon-theme/trunk/po/LINGUAS,
+ xfce4-icon-theme/trunk/po/de.po,
+ xfce4-icon-theme/trunk/po/en_GB.po,
+ xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/de.po,
+ xfce4-mixer/trunk/po/en_GB.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/de.po, xfce4-panel/trunk/po/en_GB.po,
+ xfce4-session/trunk/po/ChangeLog, xfce4-session/trunk/po/de.po,
+ xfce4-session/trunk/po/en_GB.po,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/en_GB.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/de.po,
+ xfdesktop/trunk/po/en_GB.po, xfmedia/trunk/po/ChangeLog,
+ xfmedia/trunk/po/LINGUAS, xfmedia/trunk/po/de.po,
+ xfmedia/trunk/po/en_GB.po, xfprint/trunk/po/ChangeLog,
+ xfprint/trunk/po/de.po, xfprint/trunk/po/en_GB.po,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/de.po,
+ xfwm4/trunk/po/en_GB.po: * de.po: Nico Schümann minor fixes to
+ the German translations * en_GB.po: Jeff Bailes updated the
+ British English translations for trunk and branches
+
+2007-03-27 21:46 sas
+
+ * xfce4-panel/trunk/po/hu.po, xfdesktop/trunk/po/hu.po: hu trunk:
+ desktop & panel updates
+
+2007-03-25 11:04 daichi
+
+ * libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/mk.po,
+ libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/mk.po,
+ mousepad/trunk/po/ChangeLog, mousepad/trunk/po/mk.po,
+ thunar/trunk/po/ChangeLog, thunar/trunk/po/mk.po,
+ xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/mk.po,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/mk.po,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/mk.po, xfce-utils/trunk/po/ChangeLog,
+ xfce-utils/trunk/po/mk.po, xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/mk.po,
+ xfce4-icon-theme/trunk/po/ChangeLog,
+ xfce4-icon-theme/trunk/po/mk.po, xfce4-mixer/trunk/po/ChangeLog,
+ xfce4-mixer/trunk/po/mk.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/mk.po, xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/mk.po, xfdesktop/trunk/po/ChangeLog,
+ xfdesktop/trunk/po/mk.po, xfmedia/trunk/po/ChangeLog,
+ xfmedia/trunk/po/mk.po, xfprint/trunk/po/ChangeLog,
+ xfprint/trunk/po/mk.po, xfwm4/trunk/po/ChangeLog,
+ xfwm4/trunk/po/mk.po: Removed executable attribute.
+
+2007-03-24 20:26 maximilian
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/de.po,
+ squeeze/trunk/po/ChangeLog, squeeze/trunk/po/fr.po,
+ xfburn/trunk/po/ChangeLog, xfburn/trunk/po/de.po,
+ xfcalendar/trunk/po/de.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/de.po, xfce4-panel/trunk/po/fr.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/de.po,
+ xfdesktop/trunk/po/fr.po: * de.po: Nico Schümann updated the
+ following German translations libexo; xfburn; xfce4-panel and
+ xfdesktop * fr.po: Updated the following French translations
+ squeeze; xfce4-panel and xfdesktop
+
+2007-03-23 20:26 jannis
+
+ * xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/desktop-menu.c: Synchronize with
+ libxfce4menu API. Make sure to have the correct libxfce4menu
+ version installed before enabling the menu plugin.
+
+2007-03-23 16:56 kelnos
+
+ * xfdesktop/trunk/common/desktop-menu-stub.c,
+ xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/Makefile.am,
+ xfdesktop/trunk/modules/menu/desktop-menu-private.h,
+ xfdesktop/trunk/modules/menu/desktop-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu,
+ xfdesktop/trunk/modules/menu/merge-frapmenu-svn.sh,
+ xfdesktop/trunk/panel-plugin/Makefile.am,
+ xfdesktop/trunk/src/Makefile.am: ditch frapmenu and use
+ libxfce4menu instead. awesome.
+
+2007-03-23 00:11 kelnos
+
+ * xfdesktop/trunk/src/windowlist.c: ok, i should actually read
+ patches before i apply them. change datatype from gint to
+ gboolean, because i'm anal
+
+2007-03-23 00:09 kelnos
+
+ * xfdesktop/trunk/src/windowlist.c: fix multiple separators in
+ windowlist menu when showing workspace names is disabled and
+ some workspaces are empty
+
+2007-03-20 19:41 kelnos
+
+ * xfdesktop/trunk/panel-plugin: update svn:ignore
+
+2007-03-20 19:40 kelnos
+
+ * xfdesktop/trunk: update svn:ignore
+
+2007-03-20 19:37 kelnos
+
+ * xfdesktop/trunk/po/POTFILES.in, xfdesktop/trunk/po/ar.po,
+ xfdesktop/trunk/po/az.po, xfdesktop/trunk/po/be.po,
+ xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po,
+ xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po,
+ xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/dz.po,
+ xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po,
+ xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po,
+ xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po,
+ xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po,
+ xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po,
+ xfdesktop/trunk/po/gl.po, xfdesktop/trunk/po/gu.po,
+ xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po,
+ xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po,
+ xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po,
+ xfdesktop/trunk/po/ka.po, xfdesktop/trunk/po/ko.po,
+ xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mk.po,
+ xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po,
+ xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po,
+ xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po,
+ xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po,
+ xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po,
+ xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sq.po,
+ xfdesktop/trunk/po/sv.po, xfdesktop/trunk/po/ta.po,
+ xfdesktop/trunk/po/tr.po, xfdesktop/trunk/po/uk.po,
+ xfdesktop/trunk/po/vi.po, xfdesktop/trunk/po/xfdesktop.pot,
+ xfdesktop/trunk/po/zh_CN.po, xfdesktop/trunk/po/zh_TW.po:
+ POTFILES.in: add xfce-screensavers.directory.in and remove
+ xfce-science.directory.in update-po
+
+2007-03-20 19:28 kelnos
+
+ * xfdesktop/trunk/modules/menu/frapmenu/Makefile.am,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item-cache.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.c,
+ xfdesktop/trunk/modules/menu/merge-frapmenu-svn.sh: update
+ frapmenu from libfrap svn, add script to make all this easier
+
+2007-03-20 19:08 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: shutdown and reinit
+ FrapMenu every time we regen the menu, because FrapMenu caches
+ too much
+
+2007-03-20 18:57 kelnos
+
+ * xfdesktop/trunk/modules/menu/directory-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-screensavers.directory.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu:
+ dump screensavers in a submenu of 'Settings'
+
+2007-03-20 18:48 kelnos
+
+ * xfdesktop/trunk/modules/menu/directory-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu:
+ remove 'Science' from the toplevel categories (it should get
+ sorted under 'Education' anyway).
+
+2007-03-19 23:57 kelnos
+
+ * xfdesktop/trunk/settings/behavior-settings.c,
+ xfdesktop/trunk/settings/settings-common.h,
+ xfdesktop/trunk/src/windowlist.c: add windowlist prefs: - toggle
+ showing workspace names in list - toggle showing windows in a
+ submenu per workspace - toggle showing sticky windows only in
+ the active workspace (bug 3024) need to clean up extra
+ whitespace in dialog; later
+
+2007-03-19 18:15 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: no, jannis, i don't
+ mind you updating xfdesktop, but at least use my coding style
+ next time ^_~
+
+2007-03-19 14:47 erenturkay
+
+ * xfdesktop/trunk/po/tr.po: update po
+
+2007-03-19 13:32 jannis
+
+ * xfdesktop/trunk/modules/menu/frapmenu/frap-menu.c: Update
+ frap-menu.c again.
+
+2007-03-19 13:15 jannis
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-layout.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.h: Brian, I hope
+ you don't mind me updating xfdesktop to be in sync with the
+ latest changes. I just wanted to see if it works and now that
+ the code is written down already - why not use it?
+ modules/menu/frapmenu/: * Update frap-menu.c, frap-menu.h,
+ frap-menu-layout.c. modules/menu/desktop-menu.c: * Check if the
+ menu has a layout and if not, concat submenus and items properly
+ before generating the widgets for them. * Properly set the
+ submenu name by using frap_menu_get_name(submenu) rather than
+ frap_menu_get_name(menu).
+
+2007-03-19 08:31 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: check that the menu
+ file exists before feeding it to FrapMenu
+
+2007-03-19 08:17 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: watch
+ $XDG_CONFIG_HOME/menus for changes if UserMenu is true (this
+ catches the case where the user doesn't have their own menu, but
+ creates one while xfdesktop is running)
+
+2007-03-19 07:56 kelnos
+
+ * xfdesktop/trunk/panel-plugin/Makefile.am,
+ xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c: make the
+ menu plugin not crash. not crashing is good.
+
+2007-03-19 07:36 kelnos
+
+ * xfdesktop/trunk/src/main.c, xfdesktop/trunk/src/xfce-desktop.c:
+ always init/shutdown thunar-vfs if either file icons are enabled
+ or we're using thunar-vfs for desktop menu regen monitoring.
+ don't init and shutdown when switching icon styles; just leave it
+
+2007-03-19 07:32 kelnos
+
+ * xfdesktop/trunk/src/main.c: make sure thunar-vfs gets inited if
+ we need it for the desktop menu
+
+2007-03-19 07:28 kelnos
+
+ * xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/Makefile.am,
+ xfdesktop/trunk/modules/menu/desktop-menu-private.h,
+ xfdesktop/trunk/modules/menu/desktop-menu.c: use thunar-vfs for
+ directory change notification so we know when we should
+ regenerate the desktop menu
+
+2007-03-19 07:05 sas
+
+ * xfdesktop/trunk/po/hu.po: hu trunk: dt updates
+
+2007-03-19 07:03 kelnos
+
+ * xfdesktop/trunk/modules/menu/directory-data/Makefile.am: remove
+ trailing whitespace after \
+
+2007-03-19 05:57 kelnos
+
+ * xfdesktop/trunk/4.4-i18n-migration/README: explain what's in
+ this dir
+
+2007-03-19 05:56 kelnos
+
+ * xfdesktop/trunk/4.4-i18n-migration,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/az.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ca.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/cs.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/da.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/de.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/el.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/es.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/et.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/eu.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/fa_IR.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/fi.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/fr.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/he.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/hu.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ja.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ko.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/menuxml-i18n-create-pot.pl,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/menuxml-i18n-extract-all.pl,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/menuxml-i18n-merge-all.pl,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/menuxml.pot,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ms.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/nl.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/pa.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/pl.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/pt_BR.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ro.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ru.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/sk.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/sv.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/ta.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/tr.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/uk.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/vi.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/zh_CN.po,
+ xfdesktop/trunk/4.4-i18n-migration/menuxml/zh_TW.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/ca.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/cs.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/de.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/el.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/es.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/eu.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/fi.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/fr.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/he.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/hu.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/ja.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/nl.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/pl.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/pt_BR.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/regcat-i18n-create-pot.pl,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/regcat-i18n-extract-all.pl,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/regcat-i18n-merge-all.pl,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/regcat.pot,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/ro.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/ru.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/sk.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/sv.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/tr.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/zh_CN.po,
+ xfdesktop/trunk/4.4-i18n-migration/regcat/zh_TW.po: might as
+ well save the work i did to migrate all the old menu system
+ translated strings to the new menu system. might be useful again
+ later.
+
+2007-03-19 05:54 kelnos
+
+ * xfdesktop/trunk/po/POTFILES.in, xfdesktop/trunk/po/ar.po,
+ xfdesktop/trunk/po/az.po, xfdesktop/trunk/po/be.po,
+ xfdesktop/trunk/po/bg.po, xfdesktop/trunk/po/bn_IN.po,
+ xfdesktop/trunk/po/ca.po, xfdesktop/trunk/po/cs.po,
+ xfdesktop/trunk/po/de.po, xfdesktop/trunk/po/dz.po,
+ xfdesktop/trunk/po/el.po, xfdesktop/trunk/po/en_GB.po,
+ xfdesktop/trunk/po/eo.po, xfdesktop/trunk/po/es.po,
+ xfdesktop/trunk/po/es_MX.po, xfdesktop/trunk/po/et.po,
+ xfdesktop/trunk/po/eu.po, xfdesktop/trunk/po/fa.po,
+ xfdesktop/trunk/po/fi.po, xfdesktop/trunk/po/fr.po,
+ xfdesktop/trunk/po/gl.po, xfdesktop/trunk/po/gu.po,
+ xfdesktop/trunk/po/he.po, xfdesktop/trunk/po/hi.po,
+ xfdesktop/trunk/po/hu.po, xfdesktop/trunk/po/hy.po,
+ xfdesktop/trunk/po/it.po, xfdesktop/trunk/po/ja.po,
+ xfdesktop/trunk/po/ka.po, xfdesktop/trunk/po/ko.po,
+ xfdesktop/trunk/po/lt.po, xfdesktop/trunk/po/mk.po,
+ xfdesktop/trunk/po/mr.po, xfdesktop/trunk/po/ms.po,
+ xfdesktop/trunk/po/nb_NO.po, xfdesktop/trunk/po/nl.po,
+ xfdesktop/trunk/po/pa.po, xfdesktop/trunk/po/pl.po,
+ xfdesktop/trunk/po/pt_BR.po, xfdesktop/trunk/po/pt_PT.po,
+ xfdesktop/trunk/po/ro.po, xfdesktop/trunk/po/ru.po,
+ xfdesktop/trunk/po/sk.po, xfdesktop/trunk/po/sq.po,
+ xfdesktop/trunk/po/sv.po, xfdesktop/trunk/po/ta.po,
+ xfdesktop/trunk/po/tr.po, xfdesktop/trunk/po/uk.po,
+ xfdesktop/trunk/po/vi.po, xfdesktop/trunk/po/xfdesktop.pot,
+ xfdesktop/trunk/po/zh_CN.po, xfdesktop/trunk/po/zh_TW.po: well,
+ this was fun. first, we use intltool to pull all the strings out
+ of the new.desktop and .directory files and update-po. then, we
+ write a bunch of perl scripts to extract any useful translated
+ strings from all the translated menu.xml.* and
+ xfce-registered-categories.xml.* files from the 4.4 branch, and
+ then merge them into the trunk .po files.
+
+2007-03-19 03:44 kelnos
+
+ * xfdesktop/trunk/modules/menu/menu-data: update svn:ignore
+
+2007-03-19 03:43 kelnos
+
+ * xfdesktop/trunk/modules/menu/menu-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-about-xfce.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-about-xfce.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-file-manager.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-file-manager.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-help.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-help.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-logout.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-logout.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-run-program.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-run-program.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-terminal.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-terminal.desktop.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-web-browser.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-web-browser.desktop.in:
+ make .desktop files for default root menu i18n-able
+
+2007-03-19 03:41 kelnos
+
+ * xfdesktop/trunk/modules/menu/directory-data/Makefile.am: fix
+ typo in makefile.am
+
+2007-03-19 03:36 kelnos
+
+ * xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/Makefile.am,
+ xfdesktop/trunk/modules/menu/desktop-menu.c,
+ xfdesktop/trunk/modules/menu/directory-data,
+ xfdesktop/trunk/modules/menu/directory-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-accessories.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-development.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-education.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-games.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-graphics.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-multimedia.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-network.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-office.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-other.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-settings.directory.in,
+ xfdesktop/trunk/modules/menu/directory-data/xfce-system.directory.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu:
+ add and implement .directory stuff. we have category icons now!
+
+2007-03-19 02:46 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: fix memleak; remove
+ dead code
+
+2007-03-19 02:33 kelnos
+
+ * xfdesktop/trunk, xfdesktop/trunk/modules/menu/frapmenu,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb,
+ xfdesktop/trunk/modules/menu/menu-data: update svn:ignore
+
+2007-03-19 02:29 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu/Makefile.am,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-layout.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-layout.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-separator.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-separator.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.h,
+ xfdesktop/trunk/modules/menu/frapmenu/libfrapmenu.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/Makefile.am,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/README,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/spinlock.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/spinlock.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdb.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdb.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdbtool.c,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu:
+ update my local copy of frapmenu - layout works now! (mostly)
+
+2007-03-18 17:45 jannis
+
+ * xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu:
+ Fix desktop file IDs included in the layout
+
+2007-03-18 10:38 erenturkay
+
+ * libxfce4util/branches/xfce_4_4/po/ChangeLog,
+ libxfce4util/trunk/po/ChangeLog,
+ libxfcegui4/branches/xfce_4_4/po/ChangeLog,
+ libxfcegui4/trunk/po/ChangeLog,
+ mousepad/branches/xfce_4_4/po/ChangeLog,
+ mousepad/trunk/po/ChangeLog, terminal/trunk/po/ChangeLog,
+ thunar/trunk/po/ChangeLog,
+ xfcalendar/branches/xfce_4_4/po/ChangeLog,
+ xfcalendar/trunk/po/ChangeLog,
+ xfce-mcs-manager/branches/xfce_4_4/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-plugins/branches/xfce_4_4/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-utils/branches/xfce_4_4/po/ChangeLog,
+ xfce-utils/trunk/po/ChangeLog,
+ xfce4-appfinder/branches/xfce_4_4/po/ChangeLog,
+ xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-icon-theme/branches/xfce_4_4/po/ChangeLog,
+ xfce4-icon-theme/trunk/po/ChangeLog,
+ xfce4-mixer/branches/xfce_4_4/po/ChangeLog,
+ xfce4-mixer/trunk/po/ChangeLog,
+ xfce4-panel/branches/xfce_4_4/po/ChangeLog,
+ xfce4-panel/trunk/po/ChangeLog,
+ xfce4-session/branches/xfce_4_4/po/ChangeLog,
+ xfce4-session/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfdesktop/branches/xfce_4_4/po/ChangeLog,
+ xfdesktop/trunk/po/ChangeLog,
+ xfprint/branches/xfce_4_4/po/ChangeLog,
+ xfprint/trunk/po/ChangeLog,
+ xfwm4/branches/xfce_4_4/po/ChangeLog, xfwm4/trunk/po/ChangeLog:
+ update ChangeLog
+
+2007-03-18 02:44 kelnos
+
+ * xfdesktop/trunk/INSTALL, xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/menu-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in:
+ * remove INSTALL since automake/conf or whomever appears to
+ supply it now * move xfce-applications.menu.in to
+ xfce-applications.menu since configure doesn't need to generate
+ it anymore (thanks jannis!)
+
+2007-03-17 21:12 jannis
+
+ * xfdesktop/trunk/modules/menu/menu-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/menu-data/about-xfce.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/file-manager.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/help.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/logout.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/run-program.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/terminal.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/web-browser.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-about-xfce.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-file-manager.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-help.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-logout.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-run-program.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-terminal.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce4-web-browser.desktop:
+ All .desktop files now have a "xfce4-" prefix, are part of the
+ "X-Xfce-Toplevel" category and OnlyShowIn=XFCE. They're not
+ installed into /usr/share/applications/menu-data/ anymore. Added
+ a <Layout> element to xfce-applications.menu.in. Also cleaned up
+ the file a little and added an <Include> rule for the
+ "X-Xfce-Toplevel" category in the root menu element.
+
+2007-03-04 07:18 erenturkay
+
+ * xfdesktop/trunk/po/tr.po: update Turkish translation
+
+2007-03-03 10:06 mvd
+
+ * xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/uk.po:
+ 2007-03-03 Maxim Dziumanenko <dziumanenko at gmail.com> * Update
+ Ukrainian translation.
+
+2007-02-25 02:28 kelnos
+
+ * xfdesktop/branches/xfce_4_4/settings/appearance-settings.c,
+ xfdesktop/trunk/settings/appearance-settings.c: fix uri parsing
+ to unescape '%##' stuff in the uri (bug 2942)
+
+2007-02-25 01:37 kelnos
+
+ * xfdesktop/trunk/src/xfce-backdrop.c: use nearest-neighbor
+ interpolation when compositing a backdrop image when the image
+ src is just centered or tiled onto dest. using bilinear or hyper
+ interp causes blurriness in those cases. (patch mostly from Henk
+ Boom, bug 2939). also, a minor optimisation: if the src and dest
+ image sizes are equal, pretend the image style is 'centered'
+ regardless of whatever it is to avoid extra scaling or pixbuf
+ copying.
+
+2007-02-22 17:51 kelnos
+
+ * xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/menu-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in:
+ fix weirdness with $prefix and expand $datadir properly
+
+2007-02-22 07:47 kelnos
+
+ * xfdesktop/trunk/modules/menu/desktop-menu.c: ditch empty submenus
+
+2007-02-22 07:46 kelnos
+
+ * xfdesktop/trunk/modules/menu/frapmenu/tdb/Makefile.in: remove
+ generated file (how'd that get there? bad svn!)
+
+2007-02-21 20:31 kelnos
+
+ * xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in:
+ make the 'Other' menu work properly. thanks to jannis for the tip
+
+2007-02-21 01:47 kelnos
+
+ * xfdesktop/trunk/Makefile.am, xfdesktop/trunk/menu.xml,
+ xfdesktop/trunk/menu.xml.az, xfdesktop/trunk/menu.xml.ca,
+ xfdesktop/trunk/menu.xml.cs, xfdesktop/trunk/menu.xml.da,
+ xfdesktop/trunk/menu.xml.de, xfdesktop/trunk/menu.xml.el,
+ xfdesktop/trunk/menu.xml.es, xfdesktop/trunk/menu.xml.et,
+ xfdesktop/trunk/menu.xml.eu, xfdesktop/trunk/menu.xml.fa_IR,
+ xfdesktop/trunk/menu.xml.fi, xfdesktop/trunk/menu.xml.fr,
+ xfdesktop/trunk/menu.xml.he, xfdesktop/trunk/menu.xml.hu,
+ xfdesktop/trunk/menu.xml.ja, xfdesktop/trunk/menu.xml.ko,
+ xfdesktop/trunk/menu.xml.ms, xfdesktop/trunk/menu.xml.nl,
+ xfdesktop/trunk/menu.xml.pa, xfdesktop/trunk/menu.xml.pl,
+ xfdesktop/trunk/menu.xml.pt_BR, xfdesktop/trunk/menu.xml.ro,
+ xfdesktop/trunk/menu.xml.ru, xfdesktop/trunk/menu.xml.sk,
+ xfdesktop/trunk/menu.xml.sv, xfdesktop/trunk/menu.xml.ta,
+ xfdesktop/trunk/menu.xml.tr, xfdesktop/trunk/menu.xml.uk,
+ xfdesktop/trunk/menu.xml.vi, xfdesktop/trunk/menu.xml.zh_CN,
+ xfdesktop/trunk/menu.xml.zh_TW: remove all the menu.xml.* files
+
+2007-02-21 01:45 kelnos
+
+ * xfdesktop/trunk/INSTALL,
+ xfdesktop/trunk/common/desktop-menu-stub.c,
+ xfdesktop/trunk/common/xfdesktop-common.c,
+ xfdesktop/trunk/configure.ac.in,
+ xfdesktop/trunk/modules/menu/Makefile.am,
+ xfdesktop/trunk/modules/menu/desktop-menu-cache.c,
+ xfdesktop/trunk/modules/menu/desktop-menu-cache.h,
+ xfdesktop/trunk/modules/menu/desktop-menu-dentry.c,
+ xfdesktop/trunk/modules/menu/desktop-menu-dentry.h,
+ xfdesktop/trunk/modules/menu/desktop-menu-file.c,
+ xfdesktop/trunk/modules/menu/desktop-menu-file.h,
+ xfdesktop/trunk/modules/menu/desktop-menu-private.h,
+ xfdesktop/trunk/modules/menu/desktop-menu.c,
+ xfdesktop/trunk/modules/menu/desktop-menuspec.c,
+ xfdesktop/trunk/modules/menu/desktop-menuspec.h,
+ xfdesktop/trunk/modules/menu/frapmenu,
+ xfdesktop/trunk/modules/menu/frapmenu/Makefile.am,
+ xfdesktop/trunk/modules/menu/frapmenu/README,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-and-rules.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-and-rules.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-directory.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-directory.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-environment.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-environment.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item-cache.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item-cache.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item-pool.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item-pool.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-item.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-move.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-move.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-not-rules.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-not-rules.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-or-rules.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-or-rules.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-rules.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-rules.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-standard-rules.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu-standard-rules.h,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.c,
+ xfdesktop/trunk/modules/menu/frapmenu/frap-menu.h,
+ xfdesktop/trunk/modules/menu/frapmenu/libfrapmenu.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/Makefile.am,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/Makefile.in,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/spinlock.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/spinlock.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdb.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdb.h,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdbconfig.h.in,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdbspeed.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdbtool.c,
+ xfdesktop/trunk/modules/menu/frapmenu/tdb/tdbtorture.c,
+ xfdesktop/trunk/modules/menu/menu-data,
+ xfdesktop/trunk/modules/menu/menu-data/Makefile.am,
+ xfdesktop/trunk/modules/menu/menu-data/about-xfce.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/file-manager.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/help.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/logout.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/run-program.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/terminal.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/web-browser.desktop,
+ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu.in,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.ca,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.cs,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.de,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.el,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.es,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.eu,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.fi,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.fr,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.he,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.hu,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.ja,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.nl,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.pl,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.pt_BR,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.ro,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.ru,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.sk,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.sv,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.zh_CN,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.zh_TW,
+ xfdesktop/trunk/src/Makefile.am, xfdesktop/trunk/src/main.c:
+ import a snapshot of jannis' FrapMenu and rework the desktop
+ menu to use that instead of the current implementation. it's
+ nowhere near finished. TODO: * figure out how to create an
+ ordering between items and submenus * write a script to pull all
+ the translated strings out of all the menu.xml.* and
+ xfce-registered-categories.xml.* files and merge them into the
+ appropriate .desktop and .directory files * filter out the %F,
+ %f, %u, etc. crap from the commands in the menu items * make the
+ 'Other' menu work * ...?
+
+2007-02-20 19:48 kelnos
+
+ * xfdesktop/branches/xfce_4_4/Makefile.am,
+ xfdesktop/branches/xfce_4_4/menu.xml.pa,
+ xfdesktop/trunk/Makefile.am: add punjabi menu.xml to 4.4 branch,
+ and add to makefile for trunk
+
+2007-02-19 03:36 aalam
+
+ * xfdesktop/trunk/menu.xml.pa: adding Punjabi translation file here
+
+2007-02-18 22:21 kelnos
+
+ * xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c,
+ xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-file.c,
+ xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu.h,
+ xfdesktop/branches/xfce_4_4/src/xfdesktop-icon-view.c,
+ xfdesktop/trunk/modules/menu/desktop-menu-dentry.c,
+ xfdesktop/trunk/modules/menu/desktop-menu-file.c,
+ xfdesktop/trunk/modules/menu/desktop-menu.h,
+ xfdesktop/trunk/src/xfdesktop-icon-view.c: remove use of
+ __FUNCTION__ as it breaks sun's compiler (bug 2924)
+
+2007-02-10 18:56 maximilian
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/LINGUAS,
+ libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/LINGUAS,
+ libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/LINGUAS,
+ mousepad/trunk/po/ChangeLog, mousepad/trunk/po/LINGUAS,
+ squeeze/trunk/po/ChangeLog, squeeze/trunk/po/LINGUAS,
+ terminal/trunk/po/ChangeLog, terminal/trunk/po/LINGUAS,
+ thunar/trunk/po/ChangeLog, thunar/trunk/po/LINGUAS,
+ xarchiver/trunk/po/ChangeLog, xfburn/trunk/po/ChangeLog,
+ xfburn/trunk/po/LINGUAS, xfcalendar/trunk/po/ChangeLog,
+ xfcalendar/trunk/po/LINGUAS,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/LINGUAS,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/LINGUAS,
+ xfce-utils/trunk/po/ChangeLog, xfce-utils/trunk/po/LINGUAS,
+ xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/LINGUAS,
+ xfce4-icon-theme/trunk/po/ChangeLog,
+ xfce4-icon-theme/trunk/po/LINGUAS,
+ xfce4-mixer/trunk/po/ChangeLog, xfce4-mixer/trunk/po/LINGUAS,
+ xfce4-panel/trunk/po/ChangeLog, xfce4-panel/trunk/po/LINGUAS,
+ xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/LINGUAS,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/LINGUAS,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/LINGUAS,
+ xfmedia/trunk/po/ChangeLog, xfmedia/trunk/po/LINGUAS,
+ xfprint/trunk/po/ChangeLog, xfprint/trunk/po/LINGUAS,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/LINGUAS: Verified all
+ LINGUAS files and added Albanian language to it.
+
+2007-02-10 00:44 kelnos
+
+ * xfdesktop/branches/xfce_4_4/doc/C/xfdesktop.html,
+ xfdesktop/branches/xfce_4_4/doc/C/xfdesktop.xml.in,
+ xfdesktop/trunk/doc/C/xfdesktop.html,
+ xfdesktop/trunk/doc/C/xfdesktop.xml.in: fix typo in docs
+
+2007-02-08 22:33 alnokta
+
+ * xfdesktop/trunk/po/ChangeLog: Adding information to the ChangeLog
+
+2007-02-08 22:32 alnokta
+
+ * xfdesktop/trunk/po/ar.po: 289 strings, 1 fuzzy, 11 not
+ translated. initial commit.
+
+2007-02-07 14:28 maximilian
+
+ * xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/fr.po,
+ xfcalendar/trunk/po/zh_CN.po, xfce-utils/trunk/po/ChangeLog,
+ xfce-utils/trunk/po/zh_CN.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/fr.po, xfce4-panel/trunk/po/zh_CN.po,
+ xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/zh_CN.po, xfdesktop/trunk/po/ChangeLog,
+ xfdesktop/trunk/po/fr.po, xfdesktop/trunk/po/zh_CN.po,
+ xfprint/trunk/po/ChangeLog, xfprint/trunk/po/zh_CN.po,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/zh_CN.po: Same as
+ before but in trunk now.
+
+2007-02-03 11:07 piarres
+
+ * xfdesktop/trunk/menu.xml.eu: Basque translation update
+
+2007-01-25 19:07 maximilian
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/sq.po,
+ libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/sq.po,
+ libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/sq.po,
+ mousepad/trunk/po/ChangeLog, mousepad/trunk/po/sq.po,
+ squeeze/trunk/po/ChangeLog, squeeze/trunk/po/sq.po,
+ terminal/trunk/po/ChangeLog, terminal/trunk/po/sq.po,
+ thunar/trunk/po/ChangeLog, thunar/trunk/po/fr.po,
+ thunar/trunk/po/sq.po, xarchiver/trunk/po/ChangeLog,
+ xarchiver/trunk/po/sq.po, xfburn/trunk/po/ChangeLog,
+ xfburn/trunk/po/fr.po, xfburn/trunk/po/sq.po,
+ xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/sq.po,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/sq.po,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/sq.po, xfce-utils/trunk/po/ChangeLog,
+ xfce-utils/trunk/po/sq.po, xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/sq.po,
+ xfce4-icon-theme/trunk/po/ChangeLog,
+ xfce4-icon-theme/trunk/po/sq.po, xfce4-mixer/trunk/po/ChangeLog,
+ xfce4-mixer/trunk/po/sq.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/sq.po, xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/sq.po, xfce4-terminal/trunk/po/ChangeLog,
+ xfce4-terminal/trunk/po/sq.po,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/sq.po,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/sq.po,
+ xfmedia/trunk/po/ChangeLog, xfmedia/trunk/po/sq.po,
+ xfprint/trunk/po/ChangeLog, xfprint/trunk/po/sq.po,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/sq.po: Added the
+ Albanian translations by Besnik Bleta for the core packages.
+ Updated some French translations
+
+2007-01-21 14:08 maximilian
+
+ * libexo/trunk/po/ChangeLog, libexo/trunk/po/ro.po,
+ libxfce4util/trunk/po/ChangeLog, libxfce4util/trunk/po/fr.po,
+ libxfcegui4/trunk/po/ChangeLog, libxfcegui4/trunk/po/ro.po,
+ mousepad/trunk/po/ChangeLog, mousepad/trunk/po/fr.po,
+ mousepad/trunk/po/pl.po, terminal/trunk/po/ChangeLog,
+ terminal/trunk/po/ro.po, thunar/trunk/po/ChangeLog,
+ thunar/trunk/po/pl.po, thunar/trunk/po/ro.po,
+ xfcalendar/trunk/po/ChangeLog, xfcalendar/trunk/po/ro.po,
+ xfce-mcs-manager/trunk/po/ChangeLog,
+ xfce-mcs-manager/trunk/po/ro.po,
+ xfce-mcs-plugins/trunk/po/ChangeLog,
+ xfce-mcs-plugins/trunk/po/ro.po, xfce-utils/trunk/po/ChangeLog,
+ xfce-utils/trunk/po/fr.po, xfce-utils/trunk/po/ro.po,
+ xfce4-appfinder/trunk/po/ChangeLog,
+ xfce4-appfinder/trunk/po/ro.po, xfce4-mixer/trunk/po/ChangeLog,
+ xfce4-mixer/trunk/po/ro.po, xfce4-panel/trunk/po/ChangeLog,
+ xfce4-panel/trunk/po/ro.po, xfce4-session/trunk/po/ChangeLog,
+ xfce4-session/trunk/po/ro.po,
+ xfce4-trigger-launcher/trunk/po/ChangeLog,
+ xfce4-trigger-launcher/trunk/po/ro.po,
+ xfdesktop/trunk/menu.xml.ro,
+ xfdesktop/trunk/modules/menu/xfce-registered-categories.xml.ro,
+ xfdesktop/trunk/po/ChangeLog, xfdesktop/trunk/po/ro.po,
+ xfprint/trunk/po/ChangeLog, xfprint/trunk/po/ro.po,
+ xfwm4/trunk/po/ChangeLog, xfwm4/trunk/po/ro.po: * fr.po: Minor
+ changes to the French translations in xfce-utils, libxfce4util
+ and mousepad * pl.po: Updated the Polish translation by Szymon
+ Kałasz <szymon_maestro at gazeta.pl> in thunar and mousepad. *
+ ro.po: Updated the Romanian translation by Mişu Moldovan
+ <dumol at gnome.ro> in most core packages.
+
+2007-01-21 11:53 kelnos
+
+ * xfdesktop/trunk/ChangeLog: update cl
+
2007-01-21 11:51 kelnos
* xfdesktop/trunk/NEWS: update NEWS for 4.4.0
Modified: xfdesktop/trunk/common/desktop-menu-stub.c
===================================================================
--- xfdesktop/trunk/common/desktop-menu-stub.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/common/desktop-menu-stub.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -30,6 +30,7 @@
static XfceDesktopMenu *(*xfce_desktop_menu_new_p)(const gchar *menu_file, gboolean deferred) = NULL;
GtkWidget *(*xfce_desktop_menu_get_widget)(XfceDesktopMenu *desktop_menu) = NULL;
+void (*xfce_desktop_menu_populate_menu)(XfceDesktopMenu *desktop_menu, GtkWidget *menu) = NULL;
G_CONST_RETURN gchar *(*xfce_desktop_menu_get_menu_file)(XfceDesktopMenu *desktop_menu) = NULL;
gboolean (*xfce_desktop_menu_need_update)(XfceDesktopMenu *desktop_menu) = NULL;
void (*xfce_desktop_menu_start_autoregen)(XfceDesktopMenu *desktop_menu, guint delay) = NULL;
@@ -61,6 +62,9 @@
if(!g_module_symbol(module, "xfce_desktop_menu_get_widget_impl",
(gpointer)&xfce_desktop_menu_get_widget))
return FALSE;
+ if(!g_module_symbol(module, "xfce_desktop_menu_populate_menu_impl",
+ (gpointer)&xfce_desktop_menu_populate_menu))
+ return FALSE;
if(!g_module_symbol(module, "xfce_desktop_menu_get_menu_file_impl",
(gpointer)&xfce_desktop_menu_get_menu_file))
return FALSE;
Modified: xfdesktop/trunk/common/desktop-menu-stub.h
===================================================================
--- xfdesktop/trunk/common/desktop-menu-stub.h 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/common/desktop-menu-stub.h 2007-10-20 19:10:14 UTC (rev 26158)
@@ -20,7 +20,7 @@
#ifndef __DESKTOP_MENU_STUB_H__
#define __DESKTOP_MENU_STUB_H__
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
@@ -28,6 +28,7 @@
XfceDesktopMenu *xfce_desktop_menu_new(const gchar *menu_file, gboolean deferred);
extern GtkWidget *(*xfce_desktop_menu_get_widget)(XfceDesktopMenu *desktop_menu);
+extern void (*xfce_desktop_menu_populate_menu)(XfceDesktopMenu *desktop_menu, GtkWidget *menu);
extern G_CONST_RETURN gchar *(*xfce_desktop_menu_get_menu_file)(XfceDesktopMenu *desktop_menu);
extern gboolean (*xfce_desktop_menu_need_update)(XfceDesktopMenu *desktop_menu);
extern void (*xfce_desktop_menu_start_autoregen)(XfceDesktopMenu *desktop_menu, guint delay);
Modified: xfdesktop/trunk/menueditor/Makefile.am
===================================================================
--- xfdesktop/trunk/menueditor/Makefile.am 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/menueditor/Makefile.am 2007-10-20 19:10:14 UTC (rev 26158)
@@ -1,6 +1,7 @@
bin_PROGRAMS = xfce4-menueditor
xfce4_menueditor_SOURCES = \
+ dummy_icon.h \
menueditor-add-dialog.h \
menueditor-add-dialog.c \
menueditor-add-external-dialog.h \
Copied: xfdesktop/trunk/menueditor/dummy_icon.h (from rev 26153, xfdesktop/trunk/modules/menu/dummy_icon.h)
===================================================================
--- xfdesktop/trunk/menueditor/dummy_icon.h (rev 0)
+++ xfdesktop/trunk/menueditor/dummy_icon.h 2007-10-20 19:10:14 UTC (rev 26158)
@@ -0,0 +1,161 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (dummy_icon_data)
+#endif
+#ifdef __GNUC__
+static const guint8 dummy_icon_data[] __attribute__ ((__aligned__ (4))) =
+#else
+static const guint8 dummy_icon_data[] =
+#endif
+{ ""
+ /* Pixbuf magic (0x47646b50) */
+ "GdkP"
+ /* length: header (24) + pixel_data (5) */
+ "\0\0\0\35"
+ /* pixdata_type (0x2010002) */
+ "\2\1\0\2"
+ /* rowstride (8) */
+ "\0\0\0\10"
+ /* width (2) */
+ "\0\0\0\2"
+ /* height (2) */
+ "\0\0\0\2"
+ /* pixel_data: */
+ "\204\0\0\0\0"};
+
+
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (xfce_unknown)
+#endif
+#ifdef __GNUC__
+static const guint8 xfce_unknown[] __attribute__ ((__aligned__ (4))) =
+#else
+static const guint8 xfce_unknown[] =
+#endif
+{ ""
+ /* Pixbuf magic (0x47646b50) */
+ "GdkP"
+ /* length: header (24) + pixel_data (3023) */
+ "\0\0\13\347"
+ /* pixdata_type (0x2010002) */
+ "\2\1\0\2"
+ /* rowstride (192) */
+ "\0\0\0\300"
+ /* width (48) */
+ "\0\0\0""0"
+ /* height (48) */
+ "\0\0\0""0"
+ /* pixel_data: */
+ "\377\0\0\0\0\330\0\0\0\0\2\0\0\0%\0\0\0D\256\0\0\0\0\3\3\3\5\242\5\4"
+ "\5\315\0\0\0\25\254\0\0\0\0\4\0\0\0\33\2\2\2\374\2\2\2\375\0\0\0`\242"
+ "\0\0\0\0\2\0\0\0\6\0\0\0<\210\0\0\0\0\5\2\2\4\217$\"+\372-+6\373\4\3"
+ "\4\305\0\0\0\16\207\0\0\0\0\2\0\0\0""0\0\0\0\21\231\0\0\0\0\3\1\1\1\363"
+ "\4\4\5\303\0\0\0*\205\0\0\0\0\6\0\0\0\20\3\2\3\370ga|\377oh\206\377\2"
+ "\2\3\374\0\0\0Q\205\0\0\0\0\4\0\0\0\33\5\5\6\246\1\1\1\365\0\0\0X\231"
+ "\0\0\0\0\5\7\6\10\330\22\21\26\376\2\2\3\374\3\2\3\246\0\0\0\24\203\0"
+ "\0\0\0\2\2\2\2|\33\32!\371\202\210\177\243\377\3$\"+\371\1\1\1\271\0"
+ "\0\0\12\202\0\0\0\0\6\0\0\0\14\2\2\4\206\3\2\3\372\23\22\27\375\7\7\10"
+ "\350\0\0\0L\231\0\0\0\0\12\3\3\3\251;7G\377oh\206\377\"\37(\372\4\3\4"
+ "\370\2\0\2\207\0\0\0\6\0\0\0\10\4\4\5\362^Xq\377\202\210\177\243\377"
+ "\13g`{\377\3\3\4\371\0\0\0C\0\0\0\3\0\0\0g\4\4\5\361\36\34$\371le\202"
+ "\377D at R\377\4\4\4\315\0\0\0:\231\0\0\0\0\2\0\0\0w\"\37(\371\202\210\177"
+ "\243\377\6b[u\377\23\21\26\372\5\5\6\355\0\0\0\252\22\21\27\371\207\177"
+ "\242\377\203\210\177\243\377\5\32\31\37\371\0\0\0\307\6\6\7\342\21\20"
+ "\24\371^Xq\377\202\210\177\243\377\3+(3\366\0\0\0\263\0\0\0'\231\0\0"
+ "\0\0\2\0\0\0F\13\12\15\372\203\210\177\243\377\5\206~\241\377QKa\377"
+ "\0\0\0\377\23\22\27\373ib}\377\202\210\177\243\377\5kd\200\377\30\26"
+ "\34\371\0\0\0\377MH\\\377\206}\240\377\203\210\177\243\377\3\22\21\26"
+ "\364\0\0\0\233\0\0\0\25\231\0\0\0\0\3\0\0\0\34\0\0\0\377\201y\233\377"
+ "\203\210\177\243\377\12YSj\377\4\4\5\360\1\1\1\266\3\3\3\373(&0\372*"
+ "'2\371\2\2\2\373\1\1\1\271\5\5\6\355SNd\377\203\210\177\243\377\4\206"
+ "~\241\377\2\2\2\375\0\0\0\203\0\0\0\4\232\0\0\0\0\2\3\3\3\371le\201\377"
+ "\203\210\177\243\377\13\25\24\31\366\0\0\0\255\0\0\0>\0\0\0O\3\3\4\310"
+ "\4\4\5\317\0\0\0\200\0\0\0K\0\0\0{\17\16\22\372\207~\242\377\202\210"
+ "\177\243\377\3tm\213\377\2\2\2\374\0\0\0b\233\0\0\0\0\2\7\7\10\334UP"
+ "f\377\202\210\177\243\377\14b[u\377\4\4\5\364\0\0\0q\0\0\0\10\0\0\0\0"
+ "\0\0\0\15\0\0\0\77\0\0\0\31\0\0\0\0\0\0\0\5\4\4\5\362ZTk\377\202\210"
+ "\177\243\377\3^Xq\377\7\7\10\350\0\0\0N\231\0\0\0\0\11\0\0\0\15\0\0\0"
+ "3\1\1\3\314\36\34$\377)'1\371\23\22\27\366\2\2\3\375\1\1\1\263\0\0\0"
+ "@\207\0\0\0\0\10\0\0\0\206\2\2\2\376\22\21\25\367(%/\371!\37(\377\2\2"
+ "\3\341\0\0\0e\0\0\0\17\222\0\0\0\0\17\0\0\0\35\0\0\0E\0\0\0m\3\3\3\234"
+ "\11\7\12\315\5\4\6\360\0\0\0\377\5\4\6\373\13\13\16\374\2\2\3\362\0\0"
+ "\0\263\0\0\0\235\0\0\0\207\0\0\0f\0\0\0\16\207\0\0\0\0\16\0\0\0\4\0\0"
+ "\0p\0\0\0\232\0\0\0\262\3\2\3\357\13\12\15\374\5\5\6\374\0\0\0\377\4"
+ "\4\5\364\7\7\10\327\3\3\3\253\0\0\0}\0\0\0N\0\0\0#\214\0\0\0\0\15\0\0"
+ "\0s\0\0\0\377\22\21\26\374<9H\377RLb\377f_z\377{s\223\377\210\177\243"
+ "\377aZt\377\5\5\6\361\0\0\0O\0\0\0\26\0\0\0\5\213\0\0\0\0\15\0\0\0\2"
+ "\0\0\0\21\7\7\11\343\\Vo\377\210\177\243\377{s\224\377g`{\377RMb\377"
+ "=9I\377\24\22\30\374\0\0\0\377\0\0\0\237\0\0\0""3\213\0\0\0\0\4\0\0\0"
+ "\1\0\0\0\220\4\4\5\374jc\177\377\204\210\177\243\377\3vo\216\377\1\1"
+ "\1\376\0\0\0U\216\0\0\0\0\3\0\0\0\2\2\2\2\373rk\211\377\204\210\177\243"
+ "\377\5mf\203\377\5\5\6\373\1\0\1\256\0\0\0Z\0\0\0\7\214\0\0\0\0\4\0\0"
+ "\0\1\2\0\2\225\5\5\6\374le\201\377\203\210\177\243\377\3yq\220\377\0"
+ "\0\0\377\0\0\0z\216\0\0\0\0\3\0\0\0\40\0\0\0\377um\214\377\203\210\177"
+ "\243\377\5pi\206\377\6\6\10\371\1\1\1\256\0\0\0\\\0\0\0\10\216\0\0\0"
+ "\0\11\0\0\0\2\2\2\2\234\6\5\7\374ng\204\377\210\177\243\377{s\224\377"
+ "\21\17\24\367\4\3\4\305\0\0\0f\217\0\0\0\0\11\3\3\3\264\15\15\20\372"
+ "yq\221\377\210\177\243\377rk\211\377\10\7\11\370\1\1\1\262\0\0\0]\0\0"
+ "\0\11\220\0\0\0\0\10\0\0\0\2\2\2\2\242\7\6\10\373d^x\377\23\22\27\367"
+ "\4\4\5\312\0\0\0h\0\0\0\23\217\0\0\0\0\10\0\0\0\6\3\3\4\275\17\16\22"
+ "\372g`{\377\11\10\13\370\1\1\3\265\0\0\0^\0\0\0\12\222\0\0\0\0\6\0\0"
+ "\0\3\1\1\1\256\0\0\0\377\4\4\5\324\0\0\0k\0\0\0\25\221\0\0\0\0\6\0\0"
+ "\0\10\3\3\4\307\0\0\0\377\1\1\1\276\0\0\0`\0\0\0\13\223\0\0\0\0\5\0\0"
+ "\0\20\5\5\6\327\21\20\24\375\4\4\5\365\0\0\0U\222\0\0\0\0\5\0\0\0\36"
+ "\5\4\7\353\25\24\32\375\5\5\7\352\0\0\0""8\223\0\0\0\0\7\0\0\0\16\5\5"
+ "\6\323%#-\373\205|\237\377=8I\375\4\4\5\363\0\0\0B\220\0\0\0\0\7\0\0"
+ "\0\35\6\4\6\347;7G\375\207~\242\377.+7\373\5\4\7\350\0\0\0)\221\0\0\0"
+ "\0\4\0\0\0\15\5\5\6\320#!*\372\204|\237\377\202\210\177\243\377\3<8G"
+ "\374\4\4\5\362\0\0\0""4\216\0\0\0\0\3\0\0\0\20\4\4\6\34584C\374\202\210"
+ "\177\243\377\4\206~\241\377+(3\373\4\4\7\346\0\0\0&\217\0\0\0\0\4\0\0"
+ "\0\13\5\5\6\313!\37(\372\204{\236\377\203\210\177\243\377\3\203z\235"
+ "\377\0\0\0\377\0\0\0|\216\0\0\0\0\3\0\0\0\23\0\0\0\377~v\227\377\203"
+ "\210\177\243\377\4\205}\240\377'%/\372\4\4\6\343\0\0\0#\215\0\0\0\0\4"
+ "\0\0\0\12\5\5\6\310\30\27\35\373\203z\235\377\204\210\177\243\377\3n"
+ "g\204\377\2\2\3\372\0\0\0^\217\0\0\0\0\2\4\4\5\364jc\177\377\204\210"
+ "\177\243\377\4\204|\237\377\34\32#\373\5\5\6\341\0\0\0\40\214\0\0\0\0"
+ "\13\0\0\0x\3\3\4\362\0\0\0\377\4\3\4\374\25\24\31\366,)5\372C\77Q\377"
+ "XRi\377EAS\377\7\6\10\346\0\0\0L\217\0\0\0\0\13\7\7\12\323B>O\377YSj"
+ "\377D at R\377-+6\371\26\24\32\366\4\4\5\373\0\0\0\377\3\3\4\364\0\0\0\263"
+ "\0\0\0\22\213\0\0\0\0\16\0\0\0\34\0\0\0B\0\0\0[\0\0\0\202\0\0\0\242\0"
+ "\0\0\267\5\4\6\321\7\7\11\351\2\2\2\374\0\0\0\377\5\5\6\361\6\6\11\316"
+ "\2\0\2\236\0\0\0""0\210\0\0\0\0\17\0\0\0#\2\2\3\225\10\10\11\310\5\5"
+ "\6\354\1\0\1\376\2\2\2\374\7\7\10\350\5\4\5\321\0\0\0\270\0\0\0\242\0"
+ "\0\0\215\0\0\0p\0\0\0W\0\0\0F\0\0\0)\217\0\0\0\0\13\0\0\0\5\0\0\0\26"
+ "\0\0\0&\0\0\0""7\5\5\6\316>:J\377d]x\377OJ_\377#\40)\375\5\4\5\324\0"
+ "\0\0\26\207\0\0\0\0\13\5\5\6\250\36\34$\375NI]\377b\\v\377E at R\377\6\6"
+ "\7\334\0\0\0Z\0\0\0;\0\0\0*\0\0\0\31\0\0\0\10\227\0\0\0\0\2\6\6\7\347"
+ "^Xq\377\202\210\177\243\377\3yq\220\377\2\2\2\375\0\0\0f\202\0\0\0\0"
+ "\2\0\0\0\23\0\0\0\30\202\0\0\0\0\3\0\0\0\35\2\2\2\374sl\212\377\202\210"
+ "\177\243\377\3g`{\377\5\4\6\363\0\0\0@\232\0\0\0\0\3\0\0\0\6\1\1\1\376"
+ "um\214\377\203\210\177\243\377\12""0-:\372\3\3\4\312\0\0\0\25\2\0\2t"
+ "\3\3\4\366\2\2\3\372\2\2\2\226\0\0\0\14\3\3\3\223*'2\372\203\210\177"
+ "\243\377\3}u\226\377\0\0\0\377\0\0\0Z\232\0\0\0\0\3\0\0\0,\2\2\3\375"
+ "\206~\241\377\203\210\177\243\377\12qj\210\377\1\1\2\375\5\4\6\355\24"
+ "\23\31\371c\\v\377d]x\377\27\25\34\372\4\4\5\362\2\2\3\372le\202\377"
+ "\204\210\177\243\377\2\7\6\10\372\0\0\0\205\232\0\0\0\0\2\0\0\0V\24\21"
+ "\27\370\203\210\177\243\377\5g`{\377\30\27\35\367\0\0\0\376'$.\376\207"
+ "~\242\377\202\210\177\243\377\5\207\177\242\377.+8\376\0\0\0\376\25\24"
+ "\32\372d^x\377\203\210\177\243\377\3\33\32\40\365\0\0\0\245\0\0\0\7\231"
+ "\0\0\0\0\12\0\0\0\200,)5\373\210\177\243\377tl\213\377(%/\370\3\3\4\370"
+ "\1\1\1\261\0\0\0\221\4\3\4\375~v\227\377\202\210\177\243\377\13\203z"
+ "\235\377\7\6\10\371\0\0\0\230\1\1\1\255\4\3\4\371$\"+\372qi\207\377\210"
+ "\177\243\37762@\373\0\0\0\275\0\0\0\31\231\0\0\0\0\12\6\4\6\265:6F\377"
+ "85C\374\2\2\3\373\4\4\4\302\0\0\0{\0\0\0G\0\0\0\14\6\6\7\331D at R\376\202"
+ "\210\177\243\377\13MH]\377\6\6\7\342\0\0\0b\0\0\0\6\0\0\0D\3\3\4\277"
+ "\2\2\3\37440>\373@<M\377\6\6\7\331\0\0\0+\231\0\0\0\0\6\7\6\10\342\0"
+ "\0\0\377\5\5\6\326\0\0\0\206\0\0\0S\0\0\0\26\202\0\0\0\0\7\0\0\0W\7\7"
+ "\11\373\203z\235\377\206}\240\377\13\13\16\367\0\0\0\236\0\0\0/\202\0"
+ "\0\0\0\6\0\0\0\13\0\0\0]\5\4\5\322\0\0\0\377\5\5\6\361\0\0\0=\230\0\0"
+ "\0\0\5\0\0\0\4\0\0\0\321\0\0\0\223\0\0\0^\0\0\0\"\205\0\0\0\0\6\6\4\7"
+ "\346MH]\377VPg\377\5\5\7\353\0\0\0h\0\0\0\4\204\0\0\0\0\4\0\0\0\23\0"
+ "\0\0v\0\0\0\335\0\0\0U\230\0\0\0\0\4\0\0\0\2\0\0\0=\0\0\0.\0\0\0\2\206"
+ "\0\0\0\0\5\0\0\0l\14\13\16\372\21\20\26\370\0\0\0\250\0\0\0""7\207\0"
+ "\0\0\0\2\0\0\0\36\0\0\0M\242\0\0\0\0\5\0\0\0\4\4\4\5\360\4\4\5\365\0"
+ "\0\0n\0\0\0\10\254\0\0\0\0\3\0\0\0\200\1\0\1\262\0\0\0\77\255\0\0\0\0"
+ "\3\0\0\0\10\0\0\0c\0\0\0\14\256\0\0\0\0\1\0\0\0\13\377\0\0\0\0\250\0"
+ "\0\0\0"};
+
+
Modified: xfdesktop/trunk/menueditor/menueditor-main-window.c
===================================================================
--- xfdesktop/trunk/menueditor/menueditor-main-window.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/menueditor/menueditor-main-window.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -56,7 +56,7 @@
#include "menueditor-edit-external-dialog.h"
#include "menueditor-main-window.h"
-#include "../modules/menu/dummy_icon.h"
+#include "dummy_icon.h"
#define MENUEDITOR_MAIN_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MENUEDITOR_TYPE_MAIN_WINDOW, MenuEditorMainWindowPrivate))
Modified: xfdesktop/trunk/modules/menu/Makefile.am
===================================================================
--- xfdesktop/trunk/modules/menu/Makefile.am 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/modules/menu/Makefile.am 2007-10-20 19:10:14 UTC (rev 26158)
@@ -6,11 +6,7 @@
plugin_LTLIBRARIES = xfce4_desktop_menu.la
-xfce4_desktop_menu_la_SOURCES = \
- desktop-menu.c \
- desktop-menu.h
- desktop-menu-private.h \
- dummy_icon.h
+xfce4_desktop_menu_la_SOURCES = desktop-menu.c
xfce4_desktop_menu_la_CFLAGS = \
-I$(top_srcdir)/common \
Deleted: xfdesktop/trunk/modules/menu/desktop-menu-private.h
Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -61,6 +61,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4menu/libxfce4menu.h>
#ifdef HAVE_THUNAR_VFS
#include <thunar-vfs/thunar-vfs.h>
@@ -68,14 +69,27 @@
#include "xfdesktop-common.h"
-#include "desktop-menu-private.h"
-#include "desktop-menu.h"
-#include "dummy_icon.h"
+typedef struct
+{
+ XfceMenu *xfce_menu;
+
+ gchar *filename; /* file the menu is currently using */
+ gboolean using_default_menu;
+
+ gboolean use_menu_icons; /* show menu icons? */
+
+ gint idle_id; /* source id for idled generation */
+
+ gboolean modified;
+
+#ifdef HAVE_THUNAR_VFS
+ GList *monitors;
+#endif
+} XfceDesktopMenu;
-/*< private >*/
-GdkPixbuf *dummy_icon = NULL;
-GdkPixbuf *unknown_icon = NULL;
-gint _xfce_desktop_menu_icon_size = 24;
+static void _xfce_desktop_menu_free_menudata(XfceDesktopMenu *desktop_menu);
+
+static gint _xfce_desktop_menu_icon_size = 24;
static GtkIconTheme *_deskmenu_icon_theme = NULL;
static gboolean _generate_menu(XfceDesktopMenu *desktop_menu,
@@ -284,37 +298,20 @@
g_error_free(error);
return FALSE;
}
-
- desktop_menu->menu = gtk_menu_new();
- gtk_widget_show(desktop_menu->menu);
-
- desktop_menu_add_items(desktop_menu, desktop_menu->xfce_menu,
- desktop_menu->menu);
}
return ret;
}
-/*< private >*/
-void
+static void
_xfce_desktop_menu_free_menudata(XfceDesktopMenu *desktop_menu)
{
- if(desktop_menu->menu)
- gtk_widget_destroy(desktop_menu->menu);
if(desktop_menu->xfce_menu)
g_object_unref(G_OBJECT(desktop_menu->xfce_menu));
- desktop_menu->menu = NULL;
desktop_menu->xfce_menu = NULL;
}
-void
-_desktop_menu_ensure_unknown_icon(void)
-{
- if(!unknown_icon)
- unknown_icon = gdk_pixbuf_new_from_inline(-1, xfce_unknown, TRUE, NULL);
-}
-
static gboolean
_generate_menu_initial(gpointer data) {
XfceDesktopMenu *desktop_menu = data;
@@ -368,12 +365,39 @@
return desktop_menu;
}
+G_MODULE_EXPORT void
+xfce_desktop_menu_populate_menu_impl(XfceDesktopMenu *desktop_menu,
+ GtkWidget *menu)
+{
+ g_return_if_fail(desktop_menu && menu);
+
+ if(!desktop_menu->xfce_menu) {
+ _generate_menu(desktop_menu, FALSE);
+ if(!desktop_menu->xfce_menu)
+ return;
+ }
+
+ desktop_menu_add_items(desktop_menu, desktop_menu->xfce_menu,
+ GTK_WIDGET(menu));
+}
+
G_MODULE_EXPORT GtkWidget *
xfce_desktop_menu_get_widget_impl(XfceDesktopMenu *desktop_menu)
{
+ GtkWidget *menu;
+
g_return_val_if_fail(desktop_menu != NULL, NULL);
- return desktop_menu->menu;
+ menu = gtk_menu_new();
+
+ xfce_desktop_menu_populate_menu_impl(desktop_menu, menu);
+
+ if(!desktop_menu->xfce_menu) {
+ gtk_widget_destroy(menu);
+ return NULL;
+ }
+
+ return menu;
}
G_MODULE_EXPORT G_CONST_RETURN gchar *
@@ -461,12 +485,6 @@
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
_xfce_desktop_menu_icon_size = w;
- if(dummy_icon)
- g_object_unref(G_OBJECT(dummy_icon));
- dummy_icon = xfce_inline_icon_at_size(dummy_icon_data,
- _xfce_desktop_menu_icon_size,
- _xfce_desktop_menu_icon_size);
-
_deskmenu_icon_theme = gtk_icon_theme_get_default();
return NULL;
Deleted: xfdesktop/trunk/modules/menu/desktop-menu.h
Deleted: xfdesktop/trunk/modules/menu/dummy_icon.h
Modified: xfdesktop/trunk/src/Makefile.am
===================================================================
--- xfdesktop/trunk/src/Makefile.am 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/Makefile.am 2007-10-20 19:10:14 UTC (rev 26158)
@@ -2,7 +2,6 @@
xfdesktop_SOURCES = \
main.c \
- main.h \
menu.c \
menu.h \
settings.c \
Modified: xfdesktop/trunk/src/main.c
===================================================================
--- xfdesktop/trunk/src/main.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/main.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -57,7 +57,6 @@
#if defined(ENABLE_FILE_ICONS) || defined(HAVE_THUNAR_VFS)
#endif
-#include "main.h"
#include "xfdesktop-common.h"
#include "xfce-backdrop.h"
#include "xfce-desktop.h"
@@ -168,28 +167,6 @@
return TRUE;
}
-static gboolean
-button_cb(GtkWidget *w, GdkEventButton *evt, gpointer user_data)
-{
- GdkScreen *gscreen = gtk_widget_get_screen(w);
- gint button = evt->button;
- gint state = evt->state;
-
- if(evt->type == GDK_BUTTON_PRESS) {
- if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
- && (state & GDK_CONTROL_MASK)))
- {
- popup_windowlist(gscreen, button, evt->time);
- return TRUE;
- } else if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) {
- popup_desktop_menu(gscreen, 0, evt->time);
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
static gboolean
reload_idle_cb(gpointer data)
{
@@ -198,7 +175,7 @@
return FALSE;
}
-gboolean
+static gboolean
client_message_received(GtkWidget *w, GdkEventClient *evt, gpointer user_data)
{
if(evt->data_format == 8) {
@@ -206,10 +183,12 @@
g_idle_add ((GSourceFunc)reload_idle_cb, NULL);
return TRUE;
} else if(!strcmp(MENU_MESSAGE, evt->data.b)) {
- popup_desktop_menu(gtk_widget_get_screen(w), 0, GDK_CURRENT_TIME);
+ xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), 0,
+ GDK_CURRENT_TIME);
return TRUE;
} else if(!strcmp(WINDOWLIST_MESSAGE, evt->data.b)) {
- popup_windowlist(gtk_widget_get_screen(w), 0, GDK_CURRENT_TIME);
+ xfce_desktop_popup_secondary_root_menu(XFCE_DESKTOP(w), 0,
+ GDK_CURRENT_TIME);
return TRUE;
} else if(!strcmp(QUIT_MESSAGE, evt->data.b)) {
gtk_main_quit();
@@ -361,8 +340,10 @@
| GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK);
g_signal_connect(G_OBJECT(desktops[i]), "scroll-event",
G_CALLBACK(scroll_cb), NULL);
- g_signal_connect_after(G_OBJECT(desktops[i]), "button-press-event",
- G_CALLBACK(button_cb), NULL);
+ g_signal_connect(G_OBJECT(desktops[i]), "client-event",
+ G_CALLBACK(client_message_received), NULL);
+ menu_attach(XFCE_DESKTOP(desktops[i]));
+ windowlist_attach(XFCE_DESKTOP(desktops[i]));
if(mcs_client) {
settings_register_callback(xfce_desktop_settings_changed, desktops[i]);
xfce_desktop_settings_load_initial(XFCE_DESKTOP(desktops[i]),
Deleted: xfdesktop/trunk/src/main.h
Modified: xfdesktop/trunk/src/menu.c
===================================================================
--- xfdesktop/trunk/src/menu.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/menu.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -72,12 +72,13 @@
}
#endif
-void
-popup_desktop_menu(GdkScreen *gscreen, gint button, guint32 time)
+#if USE_DESKTOP_MENU
+static void
+menu_populate(XfceDesktop *desktop,
+ GtkMenuShell *menu)
{
-#if USE_DESKTOP_MENU
- GtkWidget *menu_widget;
- GdkWindow *root;
+ GtkWidget *desktop_menu_widget;
+ GList *menu_children;
if(!desktop_menu)
return;
@@ -85,21 +86,34 @@
if(xfce_desktop_menu_need_update(desktop_menu))
xfce_desktop_menu_force_regen(desktop_menu);
- menu_widget = xfce_desktop_menu_get_widget(desktop_menu);
- if (!menu_widget)
- return;
-
- gtk_menu_set_screen(GTK_MENU(menu_widget), gscreen);
-
- root = gdk_screen_get_root_window(gscreen);
- if(!xfdesktop_popup_grab_available(root, time))
- g_critical("Unable to get keyboard/mouse grab. Unable to popup desktop menu");
- else {
- gtk_menu_popup(GTK_MENU(menu_widget), NULL, NULL, NULL, NULL,
- button, time);
+ /* check to see if the menu is empty. if not, add the desktop menu
+ * to a submenu */
+ menu_children = gtk_container_get_children(GTK_CONTAINER(menu));
+ if(menu_children) {
+ GtkWidget *mi;
+
+ g_list_free(menu_children);
+
+ desktop_menu_widget = xfce_desktop_menu_get_widget(desktop_menu);
+ if(desktop_menu_widget) {
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+
+ mi = gtk_menu_item_new_with_label(_("Applications"));
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), desktop_menu_widget);
+ gtk_widget_show(desktop_menu_widget);
+ }
+ } else {
+ /* just get the menu as a list of toplevel GtkMenuItems instead of
+ * a toplevel menu */
+ xfce_desktop_menu_populate_menu(desktop_menu, GTK_WIDGET(menu));
}
+}
#endif
-}
void
menu_init(McsClient *mcs_client)
@@ -125,6 +139,15 @@
#endif
}
+void
+menu_attach(XfceDesktop *desktop)
+{
+#if USE_DESKTOP_MENU
+ g_signal_connect_after(G_OBJECT(desktop), "populate-root-menu",
+ G_CALLBACK(menu_populate), NULL);
+#endif
+}
+
gboolean
menu_settings_changed(McsClient *client, McsAction action, McsSetting *setting,
gpointer user_data)
Modified: xfdesktop/trunk/src/menu.h
===================================================================
--- xfdesktop/trunk/src/menu.h 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/menu.h 2007-10-20 19:10:14 UTC (rev 26158)
@@ -25,16 +25,15 @@
#ifndef _XFDESKTOP__MENU_H_
#define _XFDESKTOP__MENU_H_
-#include <gdk/gdkscreen.h>
-#include <gtk/gtkwidget.h>
+#include "xfce-desktop.h"
#include <libxfce4mcs/mcs-client.h>
G_BEGIN_DECLS
void menu_init(McsClient *mcs_client);
+void menu_attach(XfceDesktop *desktop);
gboolean menu_settings_changed(McsClient *client, McsAction action, McsSetting *setting, gpointer user_data);
-void popup_desktop_menu(GdkScreen *gscreen, gint button, guint32 time);
void menu_set_show_icons(gboolean show_icons);
void menu_reload();
void menu_cleanup();
Modified: xfdesktop/trunk/src/windowlist.c
===================================================================
--- xfdesktop/trunk/src/windowlist.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/windowlist.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -188,10 +188,13 @@
return mi;
}
-static GtkWidget *
-windowlist_create(GdkScreen *gscreen)
+static void
+windowlist_populate(XfceDesktop *desktop,
+ GtkMenuShell *menu)
{
- GtkWidget *menu, *submenu, *mi, *label, *img;
+ GtkWidget *submenu, *mi, *label, *img;
+ GdkScreen *gscreen;
+ GList *menu_children;
GtkStyle *style;
NetkScreen *netk_screen;
gint nworkspaces, i;
@@ -201,24 +204,50 @@
GList *windows, *l;
NetkWindow *netk_window;
gint w, h;
- PangoFontDescription *italic_font_desc = pango_font_description_from_string("italic");
+ PangoFontDescription *italic_font_desc;
gboolean is_empty_workspace;
- g_return_val_if_fail(GDK_IS_SCREEN(gscreen), NULL);
+ if(!show_windowlist)
+ return;
- gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
+ italic_font_desc = pango_font_description_from_string("italic");
- menu = gtk_menu_new();
- gtk_widget_show(menu);
- style = gtk_widget_get_style(menu);
+ if(gtk_widget_has_screen(GTK_WIDGET(menu)))
+ gscreen = gtk_widget_get_screen(GTK_WIDGET(menu));
+ else
+ gscreen = gdk_display_get_default_screen(gdk_display_get_default());
+ /* check to see if the menu is empty. if not, add the windowlist to a
+ * submenu */
+ menu_children = gtk_container_get_children(GTK_CONTAINER(menu));
+ if(menu_children) {
+ GtkWidget *tmpmenu = gtk_menu_new();
+ gtk_menu_set_screen(GTK_MENU(tmpmenu), gscreen);
+ gtk_widget_show(tmpmenu);
+
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+
+ mi = gtk_menu_item_new_with_label(_("Window List"));
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), tmpmenu);
+ menu = (GtkMenuShell *)tmpmenu;
+ g_list_free(menu_children);
+ }
+
+ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
+ style = gtk_widget_get_style(GTK_WIDGET(menu));
+
netk_screen = netk_screen_get(gdk_screen_get_number(gscreen));
nworkspaces = netk_screen_get_workspace_count(netk_screen);
active_workspace = netk_screen_get_active_workspace(netk_screen);
for(i = 0; i < nworkspaces; i++) {
netk_workspace = netk_screen_get_workspace(netk_screen, i);
- submenu = menu;
+ submenu = (GtkWidget *)menu;
if(wl_show_ws_names || wl_submenus) {
ws_name = netk_workspace_get_name(netk_workspace);
@@ -363,46 +392,9 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
g_signal_connect(G_OBJECT(mi), "activate",
G_CALLBACK(set_num_workspaces), GINT_TO_POINTER(nworkspaces-1));
-
- return menu;
}
-static gboolean
-windowlist_deactivate_idled(gpointer user_data)
-{
- gtk_widget_destroy(GTK_WIDGET(user_data));
-
- return FALSE;
-}
-
void
-popup_windowlist(GdkScreen *gscreen, gint button, guint32 time)
-{
- GdkWindow *root;
-
- if(!show_windowlist)
- return;
-
- g_return_if_fail(GDK_IS_SCREEN(gscreen));
-
- root = gdk_screen_get_root_window(gscreen);
- if(xfdesktop_popup_grab_available(root, time)) {
- GtkWidget *windowlist;
-
- windowlist = windowlist_create(gscreen);
- if(windowlist) {
- gtk_menu_set_screen(GTK_MENU(windowlist), gscreen);
- g_signal_connect_swapped(G_OBJECT(windowlist), "deactivate",
- G_CALLBACK(g_idle_add),
- (gpointer)windowlist_deactivate_idled);
- gtk_menu_popup(GTK_MENU(windowlist), NULL, NULL, NULL, NULL,
- button, time);
- }
- } else
- g_critical("Unable to get keyboard/mouse grab. Unable to pop up windowlist");
-}
-
-void
windowlist_init(McsClient *mcs_client)
{
McsSetting *setting = NULL;
@@ -445,6 +437,13 @@
}
}
+void
+windowlist_attach(XfceDesktop *desktop)
+{
+ g_signal_connect_after(G_OBJECT(desktop), "populate-secondary-root-menu",
+ G_CALLBACK(windowlist_populate), NULL);
+}
+
gboolean
windowlist_settings_changed(McsClient *client, McsAction action,
McsSetting *setting, gpointer user_data)
Modified: xfdesktop/trunk/src/windowlist.h
===================================================================
--- xfdesktop/trunk/src/windowlist.h 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/windowlist.h 2007-10-20 19:10:14 UTC (rev 26158)
@@ -25,14 +25,14 @@
#ifndef _XFDESKTOP__WINDOWLIST_H_
#define _XFDESKTOP__WINDOWLIST_H_
-#include <gdk/gdkscreen.h>
+#include "xfce-desktop.h"
#include <libxfce4mcs/mcs-client.h>
G_BEGIN_DECLS
void windowlist_init(McsClient *mcs_client);
-void popup_windowlist(GdkScreen *gscreen, gint button, guint32 time);
+void windowlist_attach(XfceDesktop *desktop);
gboolean windowlist_settings_changed(McsClient *client, McsAction action, McsSetting *setting, gpointer user_data);
void windowlist_set_show_icons(gboolean show_icons);
void windowlist_cleanup();
Modified: xfdesktop/trunk/src/xfce-desktop.c
===================================================================
--- xfdesktop/trunk/src/xfce-desktop.c 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/xfce-desktop.c 2007-10-20 19:10:14 UTC (rev 26158)
@@ -1,7 +1,7 @@
/*
* xfdesktop - xfce4's desktop manager
*
- * Copyright (c) 2004-2006 Brian Tarricone, <bjt23 at cornell.edu>
+ * Copyright (c) 2004-2007 Brian Tarricone, <bjt23 at cornell.edu>
*
* 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
@@ -74,7 +74,6 @@
#include <libxfcegui4/libxfcegui4.h>
#include "xfdesktop-common.h"
-#include "main.h"
#include "xfce-desktop.h"
struct _XfceDesktopPriv
@@ -101,12 +100,22 @@
#endif
};
+enum
+{
+ SIG_POPULATE_ROOT_MENU = 0,
+ SIG_POPULATE_SECONDARY_ROOT_MENU,
+ N_SIGNALS
+};
+
static void xfce_desktop_class_init(XfceDesktopClass *klass);
static void xfce_desktop_init(XfceDesktop *desktop);
static void xfce_desktop_finalize(GObject *object);
static void xfce_desktop_realize(GtkWidget *widget);
static void xfce_desktop_unrealize(GtkWidget *widget);
+static gboolean xfce_desktop_button_press_event(GtkWidget *widget,
+ GdkEventButton *evt);
+static gboolean xfce_desktop_popup_menu(GtkWidget *widget);
static gboolean xfce_desktop_expose(GtkWidget *w,
GdkEventExpose *evt);
@@ -116,6 +125,8 @@
GtkStyle *old_style,
gpointer user_data);
+static guint signals[N_SIGNALS] = { 0, };
+
/* private functions */
#ifdef ENABLE_DESKTOP_ICONS
@@ -476,10 +487,6 @@
XSelectInput(GDK_DISPLAY(), xwin, PropertyChangeMask | ButtonPressMask);
XSetSelectionOwner(GDK_DISPLAY(), selection_atom, xwin, GDK_CURRENT_TIME);
- /* listen for client messages */
- g_signal_connect(G_OBJECT(desktop), "client-event",
- G_CALLBACK(client_message_received), NULL);
-
/* Check to see if we managed to claim the selection. If not,
* we treat it as if we got it then immediately lost it */
if(XGetSelectionOwner(GDK_DISPLAY(), selection_atom) == xwin) {
@@ -504,6 +511,7 @@
}
+
/* gobject-related functions */
@@ -522,8 +530,30 @@
widget_class->realize = xfce_desktop_realize;
widget_class->unrealize = xfce_desktop_unrealize;
+ widget_class->button_press_event = xfce_desktop_button_press_event;
widget_class->expose_event = xfce_desktop_expose;
widget_class->delete_event = xfce_desktop_delete_event;
+ widget_class->popup_menu = xfce_desktop_popup_menu;
+
+ signals[SIG_POPULATE_ROOT_MENU] = g_signal_new("populate-root-menu",
+ XFCE_TYPE_DESKTOP,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(XfceDesktopClass,
+ populate_root_menu),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_MENU_SHELL);
+
+ signals[SIG_POPULATE_SECONDARY_ROOT_MENU] = g_signal_new("populate-secondary-root-menu",
+ XFCE_TYPE_DESKTOP,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(XfceDesktopClass,
+ populate_secondary_root_menu),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_MENU_SHELL);
}
static void
@@ -693,6 +723,50 @@
}
static gboolean
+xfce_desktop_button_press_event(GtkWidget *w,
+ GdkEventButton *evt)
+{
+ guint button = evt->button;
+ guint state = evt->state;
+
+ if(evt->type == GDK_BUTTON_PRESS) {
+ if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK)
+ && (state & GDK_CONTROL_MASK)))
+ {
+ xfce_desktop_popup_secondary_root_menu(XFCE_DESKTOP(w),
+ button, evt->time);
+ return TRUE;
+ } else if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) {
+ xfce_desktop_popup_root_menu(XFCE_DESKTOP(w),
+ button, evt->time);
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static gboolean
+xfce_desktop_popup_menu(GtkWidget *w)
+{
+ GdkEventButton *evt;
+ guint button, etime;
+
+ evt = (GdkEventButton *)gtk_get_current_event();
+ if(evt && GDK_BUTTON_PRESS == evt->type) {
+ button = evt->button;
+ etime = evt->time;
+ } else {
+ button = 0;
+ etime = gtk_get_current_event_time();
+ }
+
+ xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime);
+
+ return TRUE;
+}
+
+static gboolean
xfce_desktop_expose(GtkWidget *w,
GdkEventExpose *evt)
{
@@ -964,3 +1038,74 @@
&& monitor < desktop->priv->nbackdrops, NULL);
return desktop->priv->backdrops[monitor];
}
+
+static gboolean
+xfce_desktop_menu_destroy_idled(gpointer data)
+{
+ gtk_widget_destroy(GTK_WIDGET(data));
+ return FALSE;
+}
+
+static void
+xfce_desktop_do_menu_popup(XfceDesktop *desktop,
+ guint button,
+ guint activate_time,
+ guint populate_signal)
+{
+ GdkScreen *screen;
+ GtkWidget *menu;
+ GList *menu_children;
+
+ TRACE("entering");
+
+ if(gtk_widget_has_screen(GTK_WIDGET(desktop)))
+ screen = gtk_widget_get_screen(GTK_WIDGET(desktop));
+ else
+ screen = gdk_display_get_default_screen(gdk_display_get_default());
+
+ menu = gtk_menu_new();
+ gtk_menu_set_screen(GTK_MENU(menu), screen);
+ gtk_widget_show(menu);
+ g_signal_connect_swapped(G_OBJECT(menu), "deactivate",
+ G_CALLBACK(g_idle_add),
+ (gpointer)xfce_desktop_menu_destroy_idled);
+
+ g_signal_emit(G_OBJECT(desktop), populate_signal, 0, menu);
+
+ /* if nobody populated the menu, don't do anything */
+ menu_children = gtk_container_get_children(GTK_CONTAINER(menu));
+ if(!menu_children) {
+ gtk_widget_destroy(menu);
+ return;
+ }
+
+ g_list_free(menu_children);
+
+ gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(desktop), NULL);
+
+ if(xfdesktop_popup_grab_available(gdk_screen_get_root_window(screen),
+ activate_time))
+ {
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button,
+ activate_time);
+ } else
+ g_critical("Unable to get keyboard/mouse grab. Unable to pop up menu");
+}
+
+void
+xfce_desktop_popup_root_menu(XfceDesktop *desktop,
+ guint button,
+ guint activate_time)
+{
+ xfce_desktop_do_menu_popup(desktop, button, activate_time,
+ signals[SIG_POPULATE_ROOT_MENU]);
+}
+
+void
+xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop,
+ guint button,
+ guint activate_time)
+{
+ xfce_desktop_do_menu_popup(desktop, button, activate_time,
+ signals[SIG_POPULATE_SECONDARY_ROOT_MENU]);
+}
Modified: xfdesktop/trunk/src/xfce-desktop.h
===================================================================
--- xfdesktop/trunk/src/xfce-desktop.h 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/xfce-desktop.h 2007-10-20 19:10:14 UTC (rev 26158)
@@ -1,7 +1,7 @@
/*
* xfdesktop - xfce4's desktop manager
*
- * Copyright (c) 2004 Brian Tarricone, <bjt23 at cornell.edu>
+ * Copyright (c) 2004-2007 Brian Tarricone, <bjt23 at cornell.edu>
*
* 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
@@ -21,9 +21,7 @@
#ifndef _XFCE_DESKTOP_H_
#define _XFCE_DESKTOP_H_
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
#include "xfce-backdrop.h"
@@ -60,6 +58,16 @@
struct _XfceDesktopClass
{
GtkWindowClass parent_class;
+
+ /*< signals >*/
+
+ /* for the app menu/file context menu */
+ void (*populate_root_menu)(XfceDesktop *desktop,
+ GtkMenuShell *menu);
+
+ /* for the windowlist menu */
+ void (*populate_secondary_root_menu)(XfceDesktop *desktop,
+ GtkMenuShell *menu);
};
GType xfce_desktop_get_type () G_GNUC_CONST;
@@ -96,6 +104,13 @@
XfceBackdrop *xfce_desktop_peek_backdrop(XfceDesktop *desktop,
guint monitor);
+void xfce_desktop_popup_root_menu(XfceDesktop *desktop,
+ guint button,
+ guint activate_time);
+void xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop,
+ guint button,
+ guint activate_time);
+
G_END_DECLS
#endif
Modified: xfdesktop/trunk/src/xfdesktop-marshal.list
===================================================================
--- xfdesktop/trunk/src/xfdesktop-marshal.list 2007-10-20 18:30:36 UTC (rev 26157)
+++ xfdesktop/trunk/src/xfdesktop-marshal.list 2007-10-20 19:10:14 UTC (rev 26158)
@@ -1,2 +1 @@
BOOLEAN:VOID
-VOID:UINT,UINT,POINTER
More information about the Xfce4-commits
mailing list