Author: jasper
Date: 2006-10-22 19:36:01 +0000 (Sun, 22 Oct 2006)
New Revision: 23492
Modified:
xfce4-panel/trunk/panel/panel-item-manager.c
xfce4-panel/trunk/plugins/actions/actions.desktop.in.in
xfce4-panel/trunk/plugins/clock/clock.desktop.in.in
xfce4-panel/trunk/plugins/iconbox/iconbox.desktop.in.in
xfce4-panel/trunk/plugins/launcher/launcher.desktop.in.in
xfce4-panel/trunk/plugins/pager/pager.desktop.in.in
xfce4-panel/trunk/plugins/separator/separator.desktop.in.in
xfce4-panel/trunk/plugins/showdesktop/showdesktop.desktop.in.in
xfce4-panel/trunk/plugins/systray/systray.desktop.in.in
xfce4-panel/trunk/plugins/tasklist/tasklist.desktop.in.in
xfce4-panel/trunk/plugins/testplugin/testplugin.desktop.in.in
xfce4-panel/trunk/plugins/windowlist/windowlist.desktop.in.in
Log:
New way to specify internal plugin name with just the basename (launcher ->
liblauncher.so) combined with X-XFCE-Module-Path entry to specifiy the
location. The old way is still supported, so this change is 100% backward
compatible.
Modified: xfce4-panel/trunk/panel/panel-item-manager.c
===================================================================
--- xfce4-panel/trunk/panel/panel-item-manager.c 2006-10-22 18:58:49 UTC
(rev 23491)
+++ xfce4-panel/trunk/panel/panel-item-manager.c 2006-10-22 19:36:01 UTC
(rev 23492)
@@ -167,16 +167,40 @@
DBG ("External plugin: %s", value);
}
- else if ((value = xfce_rc_read_entry (rc, "X-XFCE-Module", NULL)) &&
- g_file_test (value, G_FILE_TEST_EXISTS))
+ else if ((value = xfce_rc_read_entry (rc, "X-XFCE-Module", NULL)))
{
- class = panel_slice_new0 (XfcePanelItemClass);
-
- class->file = g_strdup (value);
-
- class->is_external = FALSE;
+ const char *dir;
- DBG ("Internal plugin: %s", value);
+ if (g_file_test (value, G_FILE_TEST_EXISTS))
+ {
+ class = panel_slice_new0 (XfcePanelItemClass);
+
+ class->file = g_strdup (value);
+
+ class->is_external = FALSE;
+
+ DBG ("Internal plugin: %s", value);
+ }
+ else if ((dir = xfce_rc_read_entry (rc, "X-XFCE-Module-Path",
+ NULL)))
+ {
+ char *path;
+
+ path = g_module_build_path (dir, value);
+
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ {
+ class = panel_slice_new0 (XfcePanelItemClass);
+
+ class->file = g_strdup (path);
+
+ class->is_external = FALSE;
+
+ DBG ("Internal plugin: %s", path);
+ }
+
+ g_free (path);
+ }
}
if (class)
Modified: xfce4-panel/trunk/plugins/actions/actions.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/actions/actions.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/actions/actions.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=Action Buttons
_Comment=Log out or lock the screen
Icon=xfce-system-exit
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=actions
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/clock/clock.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/clock/clock.desktop.in.in 2006-10-22 18:58:49 UTC
(rev 23491)
+++ xfce4-panel/trunk/plugins/clock/clock.desktop.in.in 2006-10-22 19:36:01 UTC
(rev 23492)
@@ -4,4 +4,6 @@
_Name=Clock
_Comment=What time is it?
Icon=xfce-schedule
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=clock
[EMAIL PROTECTED]@
+
Modified: xfce4-panel/trunk/plugins/iconbox/iconbox.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/iconbox/iconbox.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/iconbox/iconbox.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -4,4 +4,6 @@
_Name=Icon Box
_Comment=Show icons of all running applications
Icon=xfce4-iconbox
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=iconbox
[EMAIL PROTECTED]@
+
Modified: xfce4-panel/trunk/plugins/launcher/launcher.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/launcher/launcher.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -4,4 +4,6 @@
_Name=Launcher
_Comment=Program launcher with optional menu
Icon=gnome-fs-executable
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=launcher
[EMAIL PROTECTED]@
+
Modified: xfce4-panel/trunk/plugins/pager/pager.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/pager/pager.desktop.in.in 2006-10-22 18:58:49 UTC
(rev 23491)
+++ xfce4-panel/trunk/plugins/pager/pager.desktop.in.in 2006-10-22 19:36:01 UTC
(rev 23492)
@@ -4,5 +4,6 @@
_Name=Pager
_Comment=Miniature view of all virtual desktops
Icon=wksp
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=pager
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/separator/separator.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/separator/separator.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/separator/separator.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -3,5 +3,6 @@
Encoding=UTF-8
_Name=Separator or Spacing
_Comment=Adds a space or a line between panel items
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=separator
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/showdesktop/showdesktop.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/showdesktop/showdesktop.desktop.in.in
2006-10-22 18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/showdesktop/showdesktop.desktop.in.in
2006-10-22 19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=Show Desktop
_Comment=Toggle desktop show/hide
Icon=gnome-fs-desktop
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=showdesktop
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/systray/systray.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/systray/systray.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/systray/systray.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=System Tray
_Comment=Show notification icons
Icon=xfce-system-info
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=systemtray
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/tasklist/tasklist.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/tasklist/tasklist.desktop.in.in 2006-10-22
18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/tasklist/tasklist.desktop.in.in 2006-10-22
19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=Task List
_Comment=Show all running applications
Icon=xfce4-taskbar
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=tasklist
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/testplugin/testplugin.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/testplugin/testplugin.desktop.in.in
2006-10-22 18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/testplugin/testplugin.desktop.in.in
2006-10-22 19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=Test Plugin
_Comment=This plugin has no purpose
Icon=xfce-mouse
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=testplugin
[EMAIL PROTECTED]@
Modified: xfce4-panel/trunk/plugins/windowlist/windowlist.desktop.in.in
===================================================================
--- xfce4-panel/trunk/plugins/windowlist/windowlist.desktop.in.in
2006-10-22 18:58:49 UTC (rev 23491)
+++ xfce4-panel/trunk/plugins/windowlist/windowlist.desktop.in.in
2006-10-22 19:36:01 UTC (rev 23492)
@@ -4,5 +4,6 @@
_Name=Window List
_Comment=Show list of available windows
Icon=xfce-windowlist
[EMAIL PROTECTED]@/@PLUGIN_NAME@
+X-XFCE-Module=windowlist
[EMAIL PROTECTED]@
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
