← Back to team overview

xubuntu-dev team mailing list archive

[Branch ~xubuntu-dev/xubuntu-default-settings/trunk] Rev 369: * Migrate panel config to 4.10 format.

 

------------------------------------------------------------
revno: 369
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Tue 2012-05-22 20:29:08 +0200
message:
  * Migrate panel config to 4.10 format.
  * Migrate indicator-plugin config from XfceRc to Xfconf.
removed:
  etc/xdg/xdg-xubuntu/xfce4/panel/indicator-5.rc
modified:
  debian/changelog
  debian/xubuntu-default-settings.maintscript
  etc/xdg/xdg-xubuntu/xfce4/panel/default.xml


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription
=== modified file 'debian/changelog'
--- debian/changelog	2012-05-19 18:34:00 +0000
+++ debian/changelog	2012-05-22 18:29:08 +0000
@@ -1,3 +1,10 @@
+xubuntu-default-settings (12.10.1) UNRELEASED; urgency=low
+
+  * Migrate panel config to 4.10 format.
+  * Migrate indicator-plugin config from XfceRc to Xfconf.
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Tue, 22 May 2012 20:24:15 +0200
+
 xubuntu-default-settings (12.10.0) quantal; urgency=low
 
   * debian/control: recommend xfce4-session, libxfce4ui-utils instead of

=== modified file 'debian/xubuntu-default-settings.maintscript'
--- debian/xubuntu-default-settings.maintscript	2012-02-12 01:05:16 +0000
+++ debian/xubuntu-default-settings.maintscript	2012-05-22 18:29:08 +0000
@@ -16,3 +16,4 @@
 rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-orageclock-plugin-7.rc 11.04.10
 rm_conffile /etc/xdg/xdg-xubuntu/exaile/settings.ini 11.04.10
 rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/cpugraph-3.rc 11.04.10
+rm_conffile /etc/xdg/xdg-xubuntu/xfce4/panel/indicator-5.rc 12.10.1~

=== modified file 'etc/xdg/xdg-xubuntu/xfce4/panel/default.xml'
--- etc/xdg/xdg-xubuntu/xfce4/panel/default.xml	2012-04-04 16:40:22 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/default.xml	2012-05-22 18:29:08 +0000
@@ -20,7 +20,6 @@
         <value type="int" value="9"/>
       </property>
       <property name="background-style" type="uint" value="0"/>
-      <property name="horizontal" type="bool" value="true"/>
       <property name="background-alpha" type="uint" value="100"/>
       <property name="size" type="uint" value="24"/>
       <property name="autohide" type="bool" value="false"/>
@@ -28,6 +27,7 @@
       <property name="span-monitors" type="bool" value="false"/>
       <property name="enter-opacity" type="uint" value="100"/>
       <property name="leave-opacity" type="uint" value="100"/>
+      <property name="mode" type="uint" value="0"/>
     </property>
     <property name="panel-1" type="empty">
       <property name="position" type="string" value="p=8;x=960;y=1176"/>
@@ -57,7 +57,7 @@
       <property name="leave-opacity" type="uint" value="100"/>
       <property name="background-alpha" type="uint" value="15"/>
       <property name="enter-opacity" type="uint" value="100"/>
-      <property name="horizontal" type="bool" value="true"/>
+      <property name="mode" type="uint" value="0"/>
     </property>
   </property>
   <property name="plugins" type="empty">
@@ -71,13 +71,21 @@
     </property>
     <property name="plugin-3" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
     </property>
     <property name="plugin-4" type="string" value="systray">
       <property name="names-visible" type="empty"/>
       <property name="show-frame" type="bool" value="false"/>
       <property name="size-max" type="uint" value="22"/>
     </property>
-    <property name="plugin-5" type="string" value="indicator"/>
+    <property name="plugin-5" type="string" value="indicator">
+      <property name="blacklist" type="array">
+        <value type="string" value="libappmenu.so"/>
+        <value type="string" value="libdatetime.so"/>
+        <value type="string" value="libme.so"/>
+        <value type="string" value="libsession.so"/>
+      </property>
+    </property>
     <property name="plugin-6" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
@@ -94,7 +102,7 @@
     <property name="plugin-27" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
     </property>
-    <property name="plugin-9" type="string" value="xfsm-logout-plugin"/>
+    <property name="plugin-9" type="string" value="actions"/>
     <property name="plugin-10" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
       <property name="style" type="uint" value="0"/>
@@ -160,4 +168,5 @@
       <property name="style" type="uint" value="0"/>
     </property>
   </property>
+  <property name="configver" type="int" value="2"/>
 </channel>

=== removed file 'etc/xdg/xdg-xubuntu/xfce4/panel/indicator-5.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/indicator-5.rc	2011-03-08 20:10:31 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/indicator-5.rc	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Exclude=libappmenu.so,libdatetime.so,libme.so,libsession.so