[Xfce4-commits] <xfce4-panel:devel> Rename the .desktop entry X-XFCE-External to X-XFCE-Internal.

Nick Schermer nick at xfce.org
Tue Aug 11 20:30:51 CEST 2009 

Updating branch refs/heads/devel
         to 463e65dd583384be90cf63e4a11e6c150d6a2206 (commit)
       from d0bf56e90aea944515156ab2e1bde68ce29214cb (commit)

commit 463e65dd583384be90cf63e4a11e6c150d6a2206
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 22 13:49:31 2009 +0100

    Rename the .desktop entry X-XFCE-External to X-XFCE-Internal.
    
    This makes it more obvious plugins are external by default.

 NEWS                                          |    2 +-
 panel/panel-module.c                          |    2 +-
 plugins/actions/actions.desktop.in.in         |    2 +-
 plugins/clock/clock.desktop.in.in             |    2 +-
 plugins/launcher/launcher.desktop.in.in       |    2 +-
 plugins/pager/pager.desktop.in.in             |    2 +-
 plugins/separator/separator.desktop.in.in     |    2 +-
 plugins/showdesktop/showdesktop.desktop.in.in |    2 +-
 plugins/systray/systray.desktop.in.in         |    2 +-
 plugins/tasklist/tasklist.desktop.in.in       |    2 +-
 plugins/windowmenu/windowmenu.desktop.in.in   |    2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 18e6cae..4091168 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,7 @@ Plugin Framework
 - ALL PLUGINS ARE FROM NOW ON COMPILED AS LIBRARIES. So you need to change your Makefile.am (sorry). Will provide a script to do this before compiling a plugin.
 - DBus communication with external plugins.
 - Plugins API is still the same (pfew).
-- If you want to run an external plugin you can define X-XFCE-External=TRUE in the desktop file. The panel will then start a plugin wrapper that embeds the plugin, so you have all the advanatages of the previous external plugin implementation (and I get something that is easy to maintain).
+- If you want to run an internal plugin you can define X-XFCE-Internal=TRUE in the desktop file.
 - Because of the changes above, the XfcePanelPlugin is now a single gobject, this drops a lot of complexity in the previous plugin framework and also allows developing plugins as gobjects (yay).
 - Various speedups here and there.
 
diff --git a/panel/panel-module.c b/panel/panel-module.c
index 939bafd..c35d2e0 100644
--- a/panel/panel-module.c
+++ b/panel/panel-module.c
@@ -316,7 +316,7 @@ panel_module_new_from_desktop_file (const gchar *filename,
           module->is_unique = xfce_rc_read_bool_entry (rc, "X-XFCE-Unique", FALSE);
 
           /* whether to run the plugin external */
-          module->run_in_wrapper = xfce_rc_read_bool_entry (rc, "X-XFCE-External", TRUE);
+          module->run_in_wrapper = !xfce_rc_read_bool_entry (rc, "X-XFCE-Internal", FALSE);
         }
       else if (xfce_rc_has_entry (rc, "X-XFCE-Exec"))
         {
diff --git a/plugins/actions/actions.desktop.in.in b/plugins/actions/actions.desktop.in.in
index d61a774..c229069 100644
--- a/plugins/actions/actions.desktop.in.in
+++ b/plugins/actions/actions.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Log out, lock or other system actions
 Icon=system-log-out
 X-XFCE-Module=actions
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/clock/clock.desktop.in.in b/plugins/clock/clock.desktop.in.in
index 7298d4a..7b8a528 100644
--- a/plugins/clock/clock.desktop.in.in
+++ b/plugins/clock/clock.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=What time is it?
 Icon=office-calendar
 X-XFCE-Module=clock
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/launcher/launcher.desktop.in.in b/plugins/launcher/launcher.desktop.in.in
index 3ef8db3..3f53f44 100644
--- a/plugins/launcher/launcher.desktop.in.in
+++ b/plugins/launcher/launcher.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Program launcher with optional menu
 Icon=application-x-executable
 X-XFCE-Module=launcher
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/pager/pager.desktop.in.in b/plugins/pager/pager.desktop.in.in
index d71cda1..cc366aa 100644
--- a/plugins/pager/pager.desktop.in.in
+++ b/plugins/pager/pager.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Miniature view of all virtual desktops
 Icon=xfce4-workspaces
 X-XFCE-Module=pager
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/separator/separator.desktop.in.in b/plugins/separator/separator.desktop.in.in
index 3830369..ea41e48 100644
--- a/plugins/separator/separator.desktop.in.in
+++ b/plugins/separator/separator.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Adds a separator or space between panel items
 Icon=gtk-remove
 X-XFCE-Module=separator
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/showdesktop/showdesktop.desktop.in.in b/plugins/showdesktop/showdesktop.desktop.in.in
index cdc871d..d1f907a 100644
--- a/plugins/showdesktop/showdesktop.desktop.in.in
+++ b/plugins/showdesktop/showdesktop.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Toggle button that hides all windows and shows the desktop
 Icon=user-desktop
 X-XFCE-Module=showdesktop
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/systray/systray.desktop.in.in b/plugins/systray/systray.desktop.in.in
index 32b7dc4..cc2c92b 100644
--- a/plugins/systray/systray.desktop.in.in
+++ b/plugins/systray/systray.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Area where notification icons appear
 Icon=applications-system
 X-XFCE-Module=systray
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=TRUE
+X-XFCE-Internal=FALSE
diff --git a/plugins/tasklist/tasklist.desktop.in.in b/plugins/tasklist/tasklist.desktop.in.in
index 1e48d8a..61b7fce 100644
--- a/plugins/tasklist/tasklist.desktop.in.in
+++ b/plugins/tasklist/tasklist.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Show all running applications
 Icon=preferences-system-windows
 X-XFCE-Module=tasklist
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE
diff --git a/plugins/windowmenu/windowmenu.desktop.in.in b/plugins/windowmenu/windowmenu.desktop.in.in
index c320040..3a5dd03 100644
--- a/plugins/windowmenu/windowmenu.desktop.in.in
+++ b/plugins/windowmenu/windowmenu.desktop.in.in
@@ -6,4 +6,4 @@ _Comment=Switch between open windows using a menu
 Icon=preferences-system-windows
 X-XFCE-Module=windowmenu
 X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
-X-XFCE-External=FALSE
+X-XFCE-Internal=TRUE

More information about the Xfce4-commits mailing list