patches/gnome-panel-01-default-setup.diff
changeset 15139 86ed401f0f51
parent 15012 ca6b39b26bc7
child 15894 a6a45ce133bc
equal deleted inserted replaced
15138:84805e3fe19e 15139:86ed401f0f51
     1 diff -rup ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries
     1 /jds/bin/diff -uprN gnome-panel-2.25.91.old/gnome-panel/panel-default-setup.entries gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries
     2 --- ../gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries	2008-09-19 15:07:03.349073659 +0200
     2 --- gnome-panel-2.25.91.old/gnome-panel/panel-default-setup.entries	2009-02-18 11:38:49.604274000 +0000
     3 +++ gnome-panel-2.23.92/gnome-panel/panel-default-setup.entries	2008-09-19 16:16:53.527790041 +0200
     3 +++ gnome-panel-2.25.91/gnome-panel/panel-default-setup.entries	2009-02-18 12:05:06.411085000 +0000
     4 @@ -10,9 +10,6 @@
     4 @@ -10,9 +10,6 @@
     5        <value>
     5        <value>
     6          <list type="string">
     6          <list type="string">
     7            <value>
     7            <value>
     8 -            <string>top_panel</string>
     8 -            <string>top_panel</string>
    24 -            <string>email_launcher</string>
    24 -            <string>email_launcher</string>
    25 +            <string>main_menu</string>
    25 +            <string>main_menu</string>
    26            </value>
    26            </value>
    27          </list>
    27          </list>
    28        </value>
    28        </value>
    29 @@ -47,78 +38,30 @@
    29 @@ -47,75 +38,30 @@
    30        <value>
    30        <value>
    31          <list type="string">
    31          <list type="string">
    32            <value>
    32            <value>
    33 -            <string>window_menu</string>
    33 -            <string>window_menu</string>
    34 +            <string>clock</string>
    34 +            <string>clock</string>
    35            </value>
    35            </value>
    36            <value>
    36            <value>
    37 -            <string>mixer</string>
    37 -            <string>clock</string>
    38 +            <string>show_desktop</string>
    38 +            <string>show_desktop</string>
    39            </value>
    39            </value>
    40            <value>
    40            <value>
    41 -            <string>clock</string>
    41 -            <string>notification_area</string>
    42 +            <string>window_list</string>
    42 +            <string>window_list</string>
    43            </value>
    43            </value>
    44            <value>
    44            <value>
    45 -            <string>notification_area</string>
    45 -            <string>show_desktop_button</string>
    46 +            <string>workspace_switcher</string>
    46 +            <string>workspace_switcher</string>
    47            </value>
    47            </value>
    48            <value>
    48            <value>
    49 -            <string>show_desktop_button</string>
    49 -            <string>window_list</string>
    50 +            <string>notification_area</string>
    50 +            <string>notification_area</string>
    51            </value>
    51            </value>
    52            <value>
    52            <value>
    53 -            <string>window_list</string>
    53 -            <string>workspace_switcher</string>
    54 +            <string>mixer</string>
    54 +            <string>mixer</string>
    55            </value>
    55 +          </value>
    56            <value>
    56 +          <value>
    57 -            <string>workspace_switcher</string>
       
    58 +            <string>trash</string>
    57 +            <string>trash</string>
    59            </value>
    58            </value>
    60          </list>
    59          </list>
    61        </value>
    60        </value>
    62      </entry>
    61      </entry>
   110 -    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
   109 -    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
   111 -
   110 -
   112    <!-- Bottom Panel -->
   111    <!-- Bottom Panel -->
   113  
   112  
   114      <entry>
   113      <entry>
   115 @@ -139,7 +82,7 @@
   114 @@ -136,7 +82,7 @@
   116        <key>toplevels/bottom_panel/size</key>
   115        <key>toplevels/bottom_panel/size</key>
   117        <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
   116        <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
   118        <value>
   117        <value>
   119 -        <int>24</int>
   118 -        <int>24</int>
   120 +        <int>32</int>
   119 +        <int>32</int>
   121        </value>
   120        </value>
   122      </entry>
   121      </entry>
   123      <entry>
   122      <entry>
   124 @@ -165,331 +108,312 @@
   123 @@ -162,277 +108,313 @@
   125      <entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
   124      <entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
   126      <entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
   125      <entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
   127      <entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
   126      <entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
   128 -    <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
   127 -    <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
   129 -    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
   128 -    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
   132 -    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
   131 -    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
   133 -    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
   132 -    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
   134 -    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
   133 -    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
   135 -
   134 -
   136 -  <!-- Menu Bar -->
   135 -  <!-- Menu Bar -->
   137 -
   136  
   138      <entry>
   137      <entry>
   139 -      <key>objects/menu_bar/object_type</key>
   138 -      <key>objects/menu_bar/object_type</key>
   140 -      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   139 -      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   141 +      <key>toplevels/bottom_panel/background/type</key>
   140 +      <key>toplevels/bottom_panel/background/type</key>
   142 +      <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
   141 +      <schema_key>/schemas/apps/panel/toplevels/background/type</schema_key>
   143        <value>
   142        <value>
   144 -        <string>menu-bar</string>
   143 -        <string>menu-bar</string>
   145 -      </value>
   144 +        <bool>image</bool>
   146 -    </entry>
   145        </value>
   147 -    <entry>
   146      </entry>
       
   147 +    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
       
   148 +    <entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
       
   149      <entry>
   148 -      <key>objects/menu_bar/toplevel_id</key>
   150 -      <key>objects/menu_bar/toplevel_id</key>
   149 -      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   151 -      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   150 -      <value>
   152 +      <key>toplevels/bottom_panel/background/image</key>
       
   153 +      <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
       
   154        <value>
   151 -        <string>top_panel</string>
   155 -        <string>top_panel</string>
   152 -      </value>
   156 +        <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
   153 -    </entry>
   157        </value>
       
   158      </entry>
   154 -    <entry>
   159 -    <entry>
   155 -      <key>objects/menu_bar/position</key>
   160 -      <key>objects/menu_bar/position</key>
   156 -      <schema_key>/schemas/apps/panel/objects/position</schema_key>
   161 -      <schema_key>/schemas/apps/panel/objects/position</schema_key>
   157 -      <value>
   162 +    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
       
   163 +    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
       
   164        <value>
   158 -        <int>0</int>
   165 -        <int>0</int>
   159 -      </value>
   166 +        <bool>true</bool>
   160 -    </entry>
   167        </value>
       
   168      </entry>
   161 -    <entry>
   169 -    <entry>
   162 -      <key>objects/menu_bar/panel_right_stick</key>
   170 -      <key>objects/menu_bar/panel_right_stick</key>
   163 -      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   171 -      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   164 -      <value>
   172 -      <value>
   165 -        <bool>false</bool>
   173 -        <bool>false</bool>
   166 +        <string>image</string>
   174 -      </value>
   167        </value>
   175 -    </entry>
   168      </entry>
   176 -    <entry>
   169 +    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
       
   170 +    <entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
       
   171      <entry>
       
   172 -      <key>objects/menu_bar/locked</key>
   177 -      <key>objects/menu_bar/locked</key>
   173 -      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   178 -      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   174 +      <key>toplevels/bottom_panel/background/image</key>
       
   175 +      <schema_key>/schemas/apps/panel/toplevels/background/image</schema_key>
       
   176        <value>
       
   177 -        <bool>true</bool>
       
   178 +        <string>/usr/share/gnome-panel/pixmaps/bottom-panel-image.png</string>
       
   179        </value>
       
   180      </entry>
       
   181 +    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
       
   182 +    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key>
       
   183 +      <value>
       
   184 +        <bool>true</bool>
       
   185 +      </value>
       
   186 +    </entry>
       
   187 +    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
   179 +    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key>
   188 +      <value>
   180        <value>
   189 +        <bool>true</bool>
   181          <bool>true</bool>
   190 +      </value>
   182        </value>
   191 +    </entry>
   183      </entry>
   192  
   184  
   193 -    <entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
   185 -    <entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
   194 -    <entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
   186 -    <entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
   195 -    <entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
   187 -    <entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
   196 -    <entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
   188 -    <entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
   278 -  <!-- Email Launcher -->
   270 -  <!-- Email Launcher -->
   279 +  <!-- Clock Applet -->
   271 +  <!-- Clock Applet -->
   280  
   272  
   281      <entry>
   273      <entry>
   282 -      <key>objects/email_launcher/object_type</key>
   274 -      <key>objects/email_launcher/object_type</key>
   283 +      <key>applets/clock/object_type</key>
   275 +      <key>objects/clock/object_type</key>
   284        <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   276        <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   285        <value>
   277        <value>
   286 -        <string>launcher-object</string>
   278 -        <string>launcher-object</string>
   287 +        <string>bonobo-applet</string>
   279 +        <string>bonobo-object</string>
   288        </value>
   280        </value>
   289      </entry>
   281      </entry>
   290      <entry>
   282      <entry>
   291 -      <key>objects/email_launcher/toplevel_id</key>
   283 -      <key>objects/email_launcher/toplevel_id</key>
   292 +      <key>applets/clock/toplevel_id</key>
   284 +      <key>objects/clock/toplevel_id</key>
   293        <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   285        <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   294        <value>
   286        <value>
   295 -        <string>top_panel</string>
   287 -        <string>top_panel</string>
   296 +        <string>bottom_panel</string>
   288 +        <string>bottom_panel</string>
   297        </value>
   289        </value>
   298      </entry>
   290      </entry>
   299      <entry>
   291      <entry>
   300 -      <key>objects/email_launcher/position</key>
   292 -      <key>objects/email_launcher/position</key>
   301 +      <key>applets/clock/position</key>
   293 +      <key>objects/clock/position</key>
   302        <schema_key>/schemas/apps/panel/objects/position</schema_key>
   294        <schema_key>/schemas/apps/panel/objects/position</schema_key>
   303        <value>
   295        <value>
   304 -        <int>2</int>
   296 -        <int>2</int>
   305 +        <int>1</int>
   297 +        <int>1</int>
   306        </value>
   298        </value>
   307      </entry>
   299      </entry>
   308      <entry>
   300      <entry>
   309 -      <key>objects/email_launcher/panel_right_stick</key>
   301 -      <key>objects/email_launcher/panel_right_stick</key>
   310 +      <key>applets/clock/panel_right_stick</key>
   302 +      <key>objects/clock/panel_right_stick</key>
   311        <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   303        <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   312        <value>
   304        <value>
   313          <bool>false</bool>
   305          <bool>false</bool>
   314        </value>
   306        </value>
   315      </entry>
   307      </entry>
   316      <entry>
   308      <entry>
   317 -      <key>objects/email_launcher/locked</key>
   309 -      <key>objects/email_launcher/locked</key>
   318 +      <key>applets/clock/locked</key>
   310 +      <key>objects/clock/locked</key>
   319        <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   311        <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   320        <value>
   312        <value>
   321          <bool>true</bool>
   313          <bool>true</bool>
   322        </value>
   314        </value>
   323      </entry>
   315      </entry>
   426 +    <entry><key>applets/show_desktop/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   418 +    <entry><key>applets/show_desktop/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   427 +    <entry><key>applets/show_desktop/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   419 +    <entry><key>applets/show_desktop/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   428 +    <entry><key>applets/show_desktop/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   420 +    <entry><key>applets/show_desktop/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   429 +    <entry><key>applets/show_desktop/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   421 +    <entry><key>applets/show_desktop/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   430  
   422  
   431 -  <!-- Mixer Applet -->
   423 -  <!-- Clock Applet -->
   432 +  <!-- Window List Applet -->
   424 +  <!-- Window List Applet -->
   433  
   425 + 
   434      <entry>
   426 +     <entry>
   435 -      <key>applets/mixer/object_type</key>
       
   436 +      <key>applets/window_list/object_type</key>
   427 +      <key>applets/window_list/object_type</key>
   437        <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   428 +       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
   438        <value>
   429 +       <value>
   439          <string>bonobo-applet</string>
   430 +         <string>bonobo-applet</string>
   440        </value>
   431 +       </value>
   441      </entry>
   432 +     </entry>
   442      <entry>
   433 +     <entry>
   443 -      <key>applets/mixer/toplevel_id</key>
       
   444 +      <key>applets/window_list/toplevel_id</key>
   434 +      <key>applets/window_list/toplevel_id</key>
   445        <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   435 +       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   446        <value>
   436 +       <value>
   447 -        <string>top_panel</string>
       
   448 +        <string>bottom_panel</string>
   437 +        <string>bottom_panel</string>
   449        </value>
   438 +       </value>
   450      </entry>
   439 +     </entry>
   451      <entry>
   440 +     <entry>
   452 -      <key>applets/mixer/position</key>
       
   453 +      <key>applets/window_list/position</key>
   441 +      <key>applets/window_list/position</key>
   454        <schema_key>/schemas/apps/panel/objects/position</schema_key>
   442 +       <schema_key>/schemas/apps/panel/objects/position</schema_key>
   455        <value>
   443 +       <value>
   456 -        <int>1</int>
       
   457 +        <int>3</int>
   444 +        <int>3</int>
   458        </value>
   445 +       </value>
   459      </entry>
   446 +     </entry>
   460      <entry>
   447 +     <entry>
   461 -      <key>applets/mixer/panel_right_stick</key>
       
   462 +      <key>applets/window_list/panel_right_stick</key>
   448 +      <key>applets/window_list/panel_right_stick</key>
   463        <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   449 +       <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
   464        <value>
   450 +       <value>
   465 -        <bool>true</bool>
       
   466 +        <bool>false</bool>
   451 +        <bool>false</bool>
   467        </value>
   452 +       </value>
   468      </entry>
   453 +     </entry>
   469      <entry>
   454 +     <entry>
   470 -      <key>applets/mixer/locked</key>
       
   471 +      <key>applets/window_list/locked</key>
   455 +      <key>applets/window_list/locked</key>
   472        <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   456 +       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
   473        <value>
   457 +       <value>
   474          <bool>true</bool>
   458 +         <bool>true</bool>
   475        </value>
   459 +       </value>
   476      </entry>
   460 +     </entry>
   477      <entry>
   461 +     <entry>
   478 -      <key>applets/mixer/bonobo_iid</key>
       
   479 +      <key>applets/window_list/bonobo_iid</key>
   462 +      <key>applets/window_list/bonobo_iid</key>
   480        <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
   463 +       <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
   481        <value>
   464 +       <value>
   482 -        <string>OAFIID:GNOME_MixerApplet</string>
       
   483 +        <string>OAFIID:GNOME_WindowListApplet</string>
   465 +        <string>OAFIID:GNOME_WindowListApplet</string>
   484        </value>
   466 +       </value>
   485      </entry>
   467 +     </entry>
   486  
   468 + 
   487 -    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
       
   488 -    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
       
   489 -    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
       
   490 -    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
       
   491 -    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
       
   492 -    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
       
   493 -    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
       
   494 -    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
       
   495 +    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
   469 +    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
   496 +    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
   470 +    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
   497 +    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
   471 +    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
   498 +    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
   472 +    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
   499 +    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
   473 +    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
   501 +    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
   475 +    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
   502 +    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   476 +    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   503 +    <entry><key>applets/window_list/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   477 +    <entry><key>applets/window_list/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   504 +    <entry><key>applets/window_list/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   478 +    <entry><key>applets/window_list/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   505 +    <entry><key>applets/window_list/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   479 +    <entry><key>applets/window_list/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   506  
   480 +
   507 -  <!-- Clock Applet -->
       
   508 +  <!-- Workspace Switcher Applet -->
   481 +  <!-- Workspace Switcher Applet -->
   509  
   482  
   510      <entry>
   483      <entry>
   511 -      <key>applets/clock/object_type</key>
   484 -      <key>applets/clock/object_type</key>
   512 +      <key>applets/workspace_switcher/object_type</key>
   485 +      <key>applets/workspace_switcher/object_type</key>
   579 +    <entry><key>applets/workspace_switcher/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   552 +    <entry><key>applets/workspace_switcher/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   580 +    <entry><key>applets/workspace_switcher/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   553 +    <entry><key>applets/workspace_switcher/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   581  
   554  
   582    <!-- Notification Area Applet -->
   555    <!-- Notification Area Applet -->
   583  
   556  
   584 @@ -504,14 +420,14 @@
   557 @@ -447,14 +429,14 @@
   585        <key>applets/notification_area/toplevel_id</key>
   558        <key>applets/notification_area/toplevel_id</key>
   586        <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   559        <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
   587        <value>
   560        <value>
   588 -        <string>top_panel</string>
   561 -        <string>top_panel</string>
   589 +        <string>bottom_panel</string>
   562 +        <string>bottom_panel</string>
   596 -        <int>3</int>
   569 -        <int>3</int>
   597 +        <int>2</int>
   570 +        <int>2</int>
   598        </value>
   571        </value>
   599      </entry>
   572      </entry>
   600      <entry>
   573      <entry>
   601 @@ -544,168 +460,123 @@
   574 @@ -487,168 +469,123 @@
   602      <entry><key>applets/notification_area/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
   575      <entry><key>applets/notification_area/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
   603      <entry><key>applets/notification_area/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
   576      <entry><key>applets/notification_area/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
   604      <entry><key>applets/notification_area/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   577      <entry><key>applets/notification_area/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
   605 +    <entry><key>applets/notification_area/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   578 +    <entry><key>applets/notification_area/text</key><schema_key>/schemas/apps/panel/objects/text</schema_key></entry>
   606 +    <entry><key>applets/notification_area/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   579 +    <entry><key>applets/notification_area/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   807 +    <entry><key>applets/trash/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   780 +    <entry><key>applets/trash/text_font</key><schema_key>/schemas/apps/panel/objects/text_font</schema_key></entry>
   808 +    <entry><key>applets/trash/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   781 +    <entry><key>applets/trash/boundary_box</key><schema_key>/schemas/apps/panel/objects/boundary_box</schema_key></entry>
   809  
   782  
   810    </entrylist>
   783    </entrylist>
   811  
   784  
   812 Only in gnome-panel-2.23.92/gnome-panel: panel-default-setup.entries~
   785 /jds/bin/diff -uprN gnome-panel-2.25.91.old/icons/Makefile.am gnome-panel-2.25.91/icons/Makefile.am
   813 diff -rup ../gnome-panel-2.23.92/icons/Makefile.am gnome-panel-2.23.92/icons/Makefile.am
   786 --- gnome-panel-2.25.91.old/icons/Makefile.am	2009-02-18 11:38:49.693245000 +0000
   814 --- ../gnome-panel-2.23.92/icons/Makefile.am	2008-09-19 15:07:03.259964571 +0200
   787 +++ gnome-panel-2.25.91/icons/Makefile.am	2009-02-18 12:05:42.744003000 +0000
   815 +++ gnome-panel-2.23.92/icons/Makefile.am	2008-09-19 16:17:15.471779094 +0200
       
   816 @@ -7,6 +7,7 @@ gegl_DATA = 				\
   788 @@ -7,6 +7,7 @@ gegl_DATA = 				\
   817  	gnome-gegl2-2.png		\
   789  	gnome-gegl2-2.png		\
   818  	gnome-gegl2.png			\
   790  	gnome-gegl2.png			\
   819  	world_map-960.png		\
   791  	world_map-960.png		\
   820 +	bottom-panel-image.png		\
   792 +	bottom-panel-image.png		\
   821  	$(NULL)
   793  	$(NULL)
   822  
   794  
   823  EXTRA_DIST = $(gegl_DATA)
   795  EXTRA_DIST = $(gegl_DATA)
   824 Only in gnome-panel-2.23.92/icons: Makefile.am~
       
   825 Only in gnome-panel-2.23.92/icons: bottom-panel-image.png
       
   826 Only in gnome-panel-2.23.92/icons: top-panel-image.png