Merge lp:~evfool/synaptic/ancientfixes into lp:synaptic

[Robert Roth]

This branch fixes some minor issues (One commit/issue):
* Disables typeahead in summary dialog, as it doesn't do anything, so it's unnecesary (LP: #24319)
* Move up and Move down buttons in columns preferences changed to respect buttons_have_icons preference (LP: #66574)
* Set the title of the package properties dialog opened for the first time (it has not been set before, so it was synaptic the first time the dialog has been opened) (LP: #932495)
* Added a reload button to the repositories changed dialog (LP: #78987)
* Updated the wording of the expander on the download progress dialog to Show individual files" instead of "Show for individual files" (LP: #301428)
* Fixed inconsistencies between column namings in column headers and column visibility preferences (LP: #335723)
* Linkified maintainer label in the package properties dialog (LP: #321380)
* Added package name in the warning scaring you about breaking your system (LP: #63974)
* Added name of the application (Synaptic Package Manager) in the titleless dialog shown when starting without administrative privilegess (LP: #510261)
* Improved filter editing checkbox tooltips (LP: #790420)
* Made all the property values from the package properties dialog selectable (LP: #173464)
* Changed Package Properties accelerator from Ctrl+O to widely used (nautilus, eog, evince etc) Alt+Enter (LP: #933554)
* Hide the only download packages checkbox if there are no files to download (LP: #413453)
* Use the synaptic icon from the user's icon theme, or fall back to the old one if the current theme does not provide a synaptic icon (LP: #153755)
* Focus the Apply button by default. (LP: #488718)
* Removed log message from automatically installed item click (LP: #883984)
* Fixed delete filter button not working caused by a typo in the name of the button when getting it from the GtkBuilder object (LP: #779756)
* Added suggests tasksel as with tasksel installed synaptic provides additional functionality (LP: #605186)
* Fixes incorrect radiobutton handling in the proxy preferences (LP: #706262)

[Michael Vogt (mvo)]

Thanks! Most of this is great, there is one small wishlist item I have:

The link buttons should point to a custom invoke browser method. The rational
is that we don't want to open browser windows as root. So the custom code need
to run something like "sudo -u $PKEXEC_UID xdg-open $link" (or if PKEXEC_UID is
not in the environment $SUDO_USER). There is code in rgmainwindow.cc that does
something like this currently (without the PKEXEC_UID bit). That should probably
move to rutils.{cc,h} and re-used for the link buttons as well. What do you think :) ?

[Michael Vogt (mvo)]

While doing the review I noticed another small issue:

The fix for bug #755548 is not ideal as the code supports multiple selection and its actually a quite
useful feature IMO. It does not work with the "space" key very well, so we would either need to find
a way to make "space" on multiple selections clear the selection and do nothing else (so that the second
space triggers the action). Or make the space trigger the best possible action on all selection.

[Robert Roth (evfool)]

I have reverted that change, set back the selection type to multiple, to have at least the rest of the fixes merged, if they seem OK. Maybe I'll try to implement the feature you've suggested (space on multiple selections do something useful) later, or maybe someone else will pick up. Actually I was the one who reported the bug in question, and I was not aware that it does something useful :)

[Sebastien Bacher (seb128)]

@mvo: should we merge that in or do you still have issues with the current version?

[Adolfo Jayme Barrientos (fitojb)]

*fitoschido has poked you.* ;-)

[Daniel Hartwig (wigs)]

Please reconsider this change:

  * Hide the only download packages checkbox if there are no files
    to download (LP: #413453)

because it may still be enabled from a previous run (see ::showAndConfirm). The check for “download size is nil” is too simple. You also do *not* want to automagically unset this some times and not others, this is very disruptive behaviour.

To keep things simple, I suggest to revert this change and close the associated bug.

=== modified file 'gtk/rgsummarywindow.cc'
--- gtk/rgsummarywindow.cc 2010-10-07 19:51:48 +0000
+++ gtk/rgsummarywindow.cc 2012-04-10 17:44:21 +0000
@@ -393,6 +393,7 @@
         toDowngrade, unAuthenticated,sizeChange);
    lister->getDownloadSummary(dlCount, dlSize);

+ gtk_widget_set_visible(_dlonlyB, (dlSize > 0));
 #if 0
    if (held) {
       char *str = ngettext("%d package is locked\n",

[Daniel Hartwig (wigs)]

Overall I think your work on these usability issues is great.

[Michael Vogt (mvo)]

On Sun, Nov 11, 2012 at 02:57:19PM -0000, Daniel Hartwig wrote:
> Please reconsider this change:
>
> * Hide the only download packages checkbox if there are no files
> to download (LP: #413453)
>
> because it may still be enabled from a previous run (see ::showAndConfirm). The check for “download size is nil” is too simple. You also do *not* want to automagically unset this some times and not others, this is very disruptive behaviour.
>
> To keep things simple, I suggest to revert this change and close the associated bug.

Thanks Daniel, I think this is a valid concern, I reverted this for
now. I hope that is ok with you Robert, please let me know if you have
any alternative ideas, but it seems like its a relatively small change.

Cheers,
 Michael

[Robert Roth (evfool)]

Of course it's OK reverting, I have been thinking what I can do about that, that's why I haven't replied yet. But until we find a better solution, let's leave it as is. I haven't even found the bug report related to that change, although as far as I remember I have only committed bug-related changes there.

[Daniel Hartwig (wigs)]

On 14 November 2012 20:12, Robert Roth <email address hidden> wrote:
> Of course it's OK reverting, I have been thinking what I can do
> about that, that's why I haven't replied yet. But until we find a
> better solution, let's leave it as is.

The current code in trunk does not work so well. See my previous
comment. It really should not be left as is.

The better solution here is one of:
- always keep the previous choice for download-only; or
- always unset download-only.

Package management is rather complex, it is not likely that there is
a good metric to decide when to unset this selection and when not—in a
way that a user can accurately anticipate.

Someone has reported that the availability of the option was
unexpected for them, in one situation. Does not mean that anything
more sensible can realisticly be done.

> I haven't even found the bug
> report related to that change, although as far as I remember I have
> only committed bug-related changes there.

http://bugs.launchpad.net/bugs/413453

[Daniel Hartwig (wigs)]

On 17 November 2012 21:27, Daniel Hartwig <email address hidden> wrote:
> Package management is rather complex, it is not likely that there is
> a good metric to decide when to unset this selection and when not—in a
> way that a user can accurately anticipate.

For what its worth, we have had one or two similar reports against
aptitude, but what can you be expected to do when a user types:

$ aptitude install --download-only some-package

and some-package is already downloaded? Ignore --download-only?

=== modified file 'common/rpackage.cc'
--- common/rpackage.cc	2012-03-20 15:43:53 +0000
+++ common/rpackage.cc	2012-04-10 17:44:21 +0000
@@ -154,6 +154,19 @@
    return "";
 }
 
+const char *RPackage::homepage()
+{
+   static string _homepage;
+   pkgCache::VerIterator ver = (*_depcache)[*_package].CandidateVerIter(*_depcache);
+   if (!ver.end()) {
+      pkgRecords::Parser & parser = _records->Lookup(ver.FileList());
+      _homepage = parser.Homepage();
+      return _homepage .c_str();
+   }
+   return "";
+}
+
+
 string RPackage::arch()
 {
    pkgCache::VerIterator ver;
 
=== modified file 'common/rpackage.h'
--- common/rpackage.h	2012-01-31 22:11:17 +0000
+++ common/rpackage.h	2012-04-10 17:44:21 +0000
@@ -185,6 +185,7 @@
    string origin();
    
    const char *maintainer();
+   const char *homepage();
    const char *vendor();
 
    const char *installedVersion();
 
=== modified file 'debian/control'
--- debian/control	2012-04-02 08:59:42 +0000
+++ debian/control	2012-04-10 17:44:21 +0000
@@ -13,7 +13,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, hicolor-icon-theme
 Conflicts: menu (<< 2.1.11)
 Recommends: gksu|kdebase-bin|policykit-1, libgtk2-perl (>= 1:1.130), rarian-compat, software-properties-gtk
-Suggests: dwww, menu, deborphan, apt-xapian-index
+Suggests: dwww, menu, deborphan, apt-xapian-index, tasksel
 Description: Graphical package manager 
  Synaptic is a graphical package management tool based on GTK+ and APT.
  Synaptic enables you to install, upgrade and remove software packages in
 
=== modified file 'gtk/gsynaptic.cc'
--- gtk/gsynaptic.cc	2011-11-10 16:31:25 +0000
+++ gtk/gsynaptic.cc	2012-04-10 17:44:21 +0000
@@ -427,10 +427,10 @@
    if (getuid() != 0) {
       RGUserDialog userDialog;
       userDialog.warning(g_strdup_printf("<b><big>%s</big></b>\n\n%s",
-                                         _("Starting without administrative "
-                                           "privileges"),
+                                         _("Starting \"Synaptic Package Manager\" without "
+                                           "administrative privileges"),
 				         _("You will not be able to apply "
-				           "any changes. But you can still "
+				           "any changes, but you can still "
 					   "export the marked changes or "
 					   "create a download script "
 					   "for them.")));
 
=== modified file 'gtk/gtkbuilder/dialog_change_version.ui'
--- gtk/gtkbuilder/dialog_change_version.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_change_version.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_columns.ui'
--- gtk/gtkbuilder/dialog_columns.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_columns.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_conffile.ui'
--- gtk/gtkbuilder/dialog_conffile.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_conffile.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/dialog_disc_label.ui'
--- gtk/gtkbuilder/dialog_disc_label.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_disc_label.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_download_error.ui'
--- gtk/gtkbuilder/dialog_download_error.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_download_error.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">350</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/dialog_example.ui'
--- gtk/gtkbuilder/dialog_example.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_example.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/dialog_new_repositroy.ui'
--- gtk/gtkbuilder/dialog_new_repositroy.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_new_repositroy.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
 
=== modified file 'gtk/gtkbuilder/dialog_quit.ui'
--- gtk/gtkbuilder/dialog_quit.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_quit.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_task_descr.ui'
--- gtk/gtkbuilder/dialog_task_descr.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_task_descr.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="modal">True</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_unmet.ui'
--- gtk/gtkbuilder/dialog_unmet.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_unmet.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">350</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_update_failed.ui'
--- gtk/gtkbuilder/dialog_update_failed.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_update_failed.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">350</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/dialog_update_outdated.ui'
--- gtk/gtkbuilder/dialog_update_outdated.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_update_outdated.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/dialog_upgrade.ui'
--- gtk/gtkbuilder/dialog_upgrade.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/dialog_upgrade.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/dialog_welcome.ui'
--- gtk/gtkbuilder/dialog_welcome.ui	2010-10-07 22:23:12 +0000
+++ gtk/gtkbuilder/dialog_welcome.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_about.ui'
--- gtk/gtkbuilder/window_about.ui	2012-03-13 08:48:27 +0000
+++ gtk/gtkbuilder/window_about.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
@@ -269,7 +268,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_changes.ui'
--- gtk/gtkbuilder/window_changes.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_changes.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">350</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_details.ui'
--- gtk/gtkbuilder/window_details.ui	2010-11-12 21:51:18 +0000
+++ gtk/gtkbuilder/window_details.ui	2012-04-10 17:44:21 +0000
@@ -49,6 +49,7 @@
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
                         <property name="use_markup">True</property>
+                        <property name="selectable">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -94,6 +95,7 @@
                       <object class="GtkLabel" id="label_priority">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
+                        <property name="selectable">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -154,6 +156,7 @@
                         <child>
                           <object class="GtkLabel" id="label_state">
                             <property name="visible">True</property>
+                            <property name="selectable">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -328,6 +331,7 @@
                               <object class="GtkLabel" id="label_installed_size">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
+                                <property name="selectable">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -447,6 +451,7 @@
                               <object class="GtkLabel" id="label_latest_size">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
+                                <property name="selectable">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -461,6 +466,7 @@
                               <object class="GtkLabel" id="label_latest_download_size">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
+                                <property name="selectable">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
 
=== modified file 'gtk/gtkbuilder/window_disc_name.ui'
--- gtk/gtkbuilder/window_disc_name.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_disc_name.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
 
=== modified file 'gtk/gtkbuilder/window_fetch.ui'
--- gtk/gtkbuilder/window_fetch.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_fetch.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
@@ -148,7 +147,7 @@
                 <child type="label">
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
-                    <property name="label" translatable="yes">Show for individual files</property>
+                    <property name="label" translatable="yes">Show individual files</property>
                     <property name="use_underline">False</property>
                     <property name="use_markup">False</property>
                     <property name="justify">GTK_JUSTIFY_LEFT</property>
 
=== modified file 'gtk/gtkbuilder/window_filters.ui'
--- gtk/gtkbuilder/window_filters.ui	2010-11-08 23:02:53 +0000
+++ gtk/gtkbuilder/window_filters.ui	2012-04-10 17:44:21 +0000
@@ -48,7 +48,6 @@
     <property name="modal">True</property>
     <property name="default_width">640</property>
     <property name="default_height">480</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
@@ -112,7 +111,6 @@
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_stock">True</property>
-                            <signal name="clicked" handler="on_button_filters_add_clicked" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -128,7 +126,6 @@
                             <property name="can_default">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_stock">True</property>
-                            <signal name="clicked" handler="on_button_filters_remove_clicked" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -533,7 +530,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">Installed automatically as part of a dependency</property>
+                                                <property name="tooltip_text" translatable="yes">Packages installed automatically as part of a dependency</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="draw_indicator">True</property>
                                               </object>
@@ -549,7 +546,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">Automatic installed but no longer required by any other package</property>
+                                                <property name="tooltip_text" translatable="yes">Packages installed automatically but no longer required by any other package</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="draw_indicator">True</property>
                                               </object>
@@ -581,7 +578,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">Installed manually (not as a dependency by something else)</property>
+                                                <property name="tooltip_text" translatable="yes">Packages installed manually (not as a dependency of something else)</property>
                                                 <property name="use_underline">True</property>
                                                 <property name="draw_indicator">True</property>
                                               </object>
 
=== modified file 'gtk/gtkbuilder/window_find.ui'
--- gtk/gtkbuilder/window_find.ui	2010-11-12 19:32:38 +0000
+++ gtk/gtkbuilder/window_find.ui	2012-04-10 17:44:21 +0000
@@ -5,7 +5,6 @@
   <object class="GtkDialog" id="window_find">
     <property name="visible">True</property>
     <property name="border_width">6</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
 
=== modified file 'gtk/gtkbuilder/window_iconlegend.ui'
--- gtk/gtkbuilder/window_iconlegend.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_iconlegend.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">False</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
 
=== modified file 'gtk/gtkbuilder/window_logview.ui'
--- gtk/gtkbuilder/window_logview.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_logview.ui	2012-04-10 17:44:21 +0000
@@ -11,7 +11,6 @@
     <property name="default_height">400</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_main.ui'
--- gtk/gtkbuilder/window_main.ui	2012-02-13 12:14:51 +0000
+++ gtk/gtkbuilder/window_main.ui	2012-04-10 17:44:21 +0000
@@ -543,7 +543,7 @@
                         <property name="use_underline">True</property>
                         <property name="image">image16</property>
                         <property name="use_stock">False</property>
-                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
+                        <accelerator key="Return" signal="activate" modifiers="GDK_MOD1_MASK"/>
                         <signal name="activate" handler="on_button_details_clicked" swapped="no"/>
                       </object>
                     </child>
 
=== modified file 'gtk/gtkbuilder/window_preferences.ui'
--- gtk/gtkbuilder/window_preferences.ui	2011-02-09 13:25:14 +0000
+++ gtk/gtkbuilder/window_preferences.ui	2012-04-10 17:44:21 +0000
@@ -26,12 +26,21 @@
       <column type="gchararray"/>
     </columns>
   </object>
+  <object class="GtkImage" id="move_down_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-down</property>
+  </object>
+  <object class="GtkImage" id="move_up_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-go-up</property>
+  </object>
   <object class="GtkWindow" id="window_preferences">
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <child>
       <object class="GtkVBox" id="vbox8">
         <property name="visible">True</property>
@@ -515,49 +524,19 @@
                             <child>
                               <object class="GtkVBox" id="vbox39">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkButton" id="button_column_up">
+                                    <property name="label" translatable="yes">Move _Up</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <signal name="clicked" handler="on_button_column_up_clicked"/>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment4">
-                                        <property name="visible">True</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox80">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <object class="GtkImage" id="image11">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-go-up</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label163">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Move _Up</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="image">move_up_image</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="clicked" handler="on_button_column_up_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -567,46 +546,15 @@
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_column_down">
+                                    <property name="label" translatable="yes">Move D_own</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <signal name="clicked" handler="on_button_column_down_clicked"/>
-                                    <child>
-                                      <object class="GtkAlignment" id="alignment5">
-                                        <property name="visible">True</property>
-                                        <property name="xscale">0</property>
-                                        <property name="yscale">0</property>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox81">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">2</property>
-                                            <child>
-                                              <object class="GtkImage" id="image12">
-                                                <property name="visible">True</property>
-                                                <property name="stock">gtk-go-down</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label164">
-                                                <property name="visible">True</property>
-                                                <property name="label" translatable="yes">Move D_own</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">False</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                    </child>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="image">move_down_image</property>
+                                    <property name="use_underline">True</property>
+                                    <signal name="clicked" handler="on_button_column_down_clicked" swapped="no"/>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
 
=== modified file 'gtk/gtkbuilder/window_rgdebinstall_progress.ui'
--- gtk/gtkbuilder/window_rgdebinstall_progress.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_rgdebinstall_progress.ui	2012-04-10 17:44:21 +0000
@@ -9,7 +9,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_rginstall_progress.ui'
--- gtk/gtkbuilder/window_rginstall_progress.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_rginstall_progress.ui	2012-04-10 17:44:21 +0000
@@ -10,7 +10,6 @@
     <property name="modal">True</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <child>
       <object class="GtkVBox" id="vbox11">
         <property name="visible">True</property>
 
=== modified file 'gtk/gtkbuilder/window_setopt.ui'
--- gtk/gtkbuilder/window_setopt.ui	2010-10-07 18:13:47 +0000
+++ gtk/gtkbuilder/window_setopt.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">140</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/gtkbuilder/window_summary.ui'
--- gtk/gtkbuilder/window_summary.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_summary.ui	2012-04-10 17:44:21 +0000
@@ -9,7 +9,6 @@
     <property name="modal">True</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">False</property>
@@ -46,6 +45,7 @@
                 <property name="tooltip-text" translatable="yes">Apply all marked changes</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
+                <property name="has_focus">True</property>
                 <property name="can_focus">True</property>
                 <property name="label">gtk-apply</property>
                 <property name="use_stock">True</property>
@@ -181,7 +181,7 @@
                             <property name="headers_visible">False</property>
                             <property name="rules_hint">False</property>
                             <property name="reorderable">False</property>
-                            <property name="enable_search">True</property>
+                            <property name="enable_search">False</property>
                             <property name="fixed_height_mode">False</property>
                             <property name="hover_selection">False</property>
                             <property name="hover_expand">False</property>
 
=== modified file 'gtk/gtkbuilder/window_tasks.ui'
--- gtk/gtkbuilder/window_tasks.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_tasks.ui	2012-04-10 17:44:21 +0000
@@ -12,7 +12,6 @@
     <property name="default_height">400</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
 
=== modified file 'gtk/gtkbuilder/window_zvtinstallprogress.ui'
--- gtk/gtkbuilder/window_zvtinstallprogress.ui	2010-10-06 15:22:41 +0000
+++ gtk/gtkbuilder/window_zvtinstallprogress.ui	2012-04-10 17:44:21 +0000
@@ -9,7 +9,6 @@
     <property name="modal">False</property>
     <property name="resizable">True</property>
     <property name="destroy_with_parent">False</property>
-    <property name="icon">synaptic_mini.xpm</property>
     <property name="decorated">True</property>
     <property name="skip_taskbar_hint">False</property>
     <property name="skip_pager_hint">False</property>
 
=== modified file 'gtk/rgdebinstallprogress.cc'
--- gtk/rgdebinstallprogress.cc	2010-12-07 14:48:38 +0000
+++ gtk/rgdebinstallprogress.cc	2012-04-10 17:44:21 +0000
@@ -669,7 +669,7 @@
        return res;
 
    // we need to send the fds from the pipe over a socket because
-   // §""!%&§/ vte_terminal closes all our FDs 
+   // the vte_terminal closes all our FDs 
    _child_id = vte_terminal_forkpty(VTE_TERMINAL(_term),NULL,NULL,
 				    false,false,false);
    if (_child_id < 0) {
@@ -773,8 +773,8 @@
    GtkWidget *img = GTK_WIDGET(gtk_builder_get_object(_builder, "image_finished"));
    switch(res) {
    case 0: // success
-      gtk_image_set_from_file(GTK_IMAGE(img),
-			      PACKAGE_DATA_DIR"/pixmaps/synaptic.png");
+      gtk_image_set_from_icon_name(GTK_IMAGE(img),
+			      "synaptic", GTK_ICON_SIZE_DIALOG);
       break;
    case 1: // error
       gtk_image_set_from_stock(GTK_IMAGE(img), GTK_STOCK_DIALOG_ERROR,
 
=== modified file 'gtk/rgfiltermanager.cc'
--- gtk/rgfiltermanager.cc	2011-02-10 08:35:34 +0000
+++ gtk/rgfiltermanager.cc	2012-04-10 17:44:21 +0000
@@ -96,7 +96,7 @@
                     "clicked",
                     G_CALLBACK(addFilterAction), this);
 
-   g_signal_connect(gtk_builder_get_object(_builder, "buttons_filters_remove"),
+   g_signal_connect(gtk_builder_get_object(_builder, "button_filters_remove"),
                     "clicked",
                     G_CALLBACK(removeFilterAction), this);
 
 
=== modified file 'gtk/rggtkbuilderwindow.cc'
--- gtk/rggtkbuilderwindow.cc	2010-11-12 18:58:47 +0000
+++ gtk/rggtkbuilderwindow.cc	2012-04-10 17:44:21 +0000
@@ -71,6 +71,8 @@
 
    gtk_window_set_position(GTK_WINDOW(_win),
 			   GTK_WIN_POS_CENTER_ON_PARENT);
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
+   gtk_window_set_icon(GTK_WINDOW(_win), icon);
 
    g_free(filename);
    g_free(local_filename);
@@ -117,6 +119,22 @@
    return true;
 }
 
+bool RGGtkBuilderWindow::setMarkup(const char *widget_name, const char *value)
+{
+   GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (_builder, widget_name));
+   if (widget == NULL) {
+      cout << "widget == NULL with: " << widget_name << endl;
+      return false;
+   }
+
+   const gchar *utf8value=utf8(value);
+
+   if (!utf8value)
+      utf8value = _("N/A");
+   gtk_label_set_markup(GTK_LABEL(widget), utf8value);
+   return true;
+}
+
 bool RGGtkBuilderWindow::setLabel(const char *widget_name, const long value)
 {
    string strVal;
 
=== modified file 'gtk/rggtkbuilderwindow.h'
--- gtk/rggtkbuilderwindow.h	2010-10-06 21:07:41 +0000
+++ gtk/rggtkbuilderwindow.h	2012-04-10 17:44:21 +0000
@@ -53,6 +53,7 @@
 
    // functions to set various widgets
    bool setLabel(const char *name, const char *value);
+   bool setMarkup(const char *widget_name, const char *value);
    bool setLabel(const char *name, const long value);
    bool setTextView(const char *widget_name, const char *value,
 		    bool useHeadline=false);
 
=== modified file 'gtk/rgmainwindow.cc'
--- gtk/rgmainwindow.cc	2012-03-02 09:41:07 +0000
+++ gtk/rgmainwindow.cc	2012-04-10 17:44:21 +0000
@@ -77,9 +77,6 @@
 #include "rgutils.h"
 #include "sections_trans.h"
 
-// icons and pixmaps
-#include "synaptic.xpm"
-
 #include "i18n.h"
 
 // include it here because depcache.h hates us if we have it before
@@ -491,8 +488,7 @@
    RGMainWindow *me = (RGMainWindow *) data;
    if (me->_blockActions)
       return;
-   cout << "RGMainWindow::cbMenuAutoInstalledClickedn()" << endl;
-
+   
    bool active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(self));
 
    GtkTreeSelection *selection;
@@ -1200,9 +1196,7 @@
    // here is a pointer to rgmainwindow for every widget that needs it
    g_object_set_data(G_OBJECT(_win), "me", this);
 
-
-   GdkPixbuf *icon = gdk_pixbuf_new_from_xpm_data((const char **)
-                                                  synaptic_xpm);
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
    gtk_window_set_icon(GTK_WINDOW(_win), icon);
 
    gtk_window_resize(GTK_WINDOW(_win),
@@ -1890,10 +1884,13 @@
 void RGMainWindow::pkgRemoveHelper(RPackage *pkg, bool purge, bool withDeps)
 {
    if (pkg->getFlags() & RPackage::FImportant) {
-      if (!_userDialog->confirm(_("Removing this package may render the "
-                                  "system unusable.\n"
-                                  "Are you sure you want to do that?"),
-				false)) {
+      gchar* warning = g_strdup_printf(_( "Removing package \"%s\" may render the "
+                                          "system unusable.\n"
+                                          "Are you sure you want to do that?"), 
+                                       pkg->name());
+      bool confirmed = _userDialog->confirm(warning, false);
+      g_free(warning);
+      if (!confirmed) {
          return;
       }
    }
@@ -2398,7 +2395,7 @@
    if(me->_pkgDetails == NULL)
       me->_pkgDetails = new RGPkgDetailsWindow(me);
 
-   RGPkgDetailsWindow::fillInValues(me->_pkgDetails, pkg);
+   RGPkgDetailsWindow::fillInValues(me->_pkgDetails, pkg, true);
    me->_pkgDetails->show();
 }
 
@@ -2465,7 +2462,7 @@
       dialog = gtk_message_dialog_new (GTK_WINDOW(me->window()),
 				       GTK_DIALOG_DESTROY_WITH_PARENT,
 				       GTK_MESSAGE_INFO,
-				       GTK_BUTTONS_CLOSE,
+				       GTK_BUTTONS_NONE,
 				       _("Repositories changed"));
       // TRANSLATORS: this message appears when the user added/removed 
       // a repository (sources.list entry) a reload (apt-get update) is 
@@ -2481,13 +2478,21 @@
 #else
       gtk_message_dialog_set_markup(GTK_MESSAGE_DIALOG(dialog), msgstr);
 #endif
+      gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, _("_Reload"), GTK_RESPONSE_ACCEPT, NULL);
+      GtkWidget* reload_button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
+      GtkWidget* refresh_image = gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+      gtk_button_set_image(GTK_BUTTON(reload_button), refresh_image);
       cb = gtk_check_button_new_with_label(_("Never show this message again"));
       gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox),cb);
       gtk_widget_show(cb);
-      gtk_dialog_run (GTK_DIALOG (dialog));
+      gint response = gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_hide(dialog);
       if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb))) {
 	    _config->Set("Synaptic::AskForUpdateAfterSrcChange", false);
       }
+      if (response == GTK_RESPONSE_ACCEPT) {
+         me->cbUpdateClicked(NULL, data);
+      }
       gtk_widget_destroy (dialog);
    }
 }
@@ -2593,41 +2598,27 @@
 
    me->setStatusText(_("Starting help viewer..."));
 
-   string cmd;
-   if (is_binary_in_path("yelp"))
-      cmd = "yelp ghelp:synaptic";
-#if 0 // FIXME: khelpcenter can't display this? check again!
-    else if(is_binary_in_path("khelpcenter")) {
-       system("konqueror ghelp:///" PACKAGE_DATA_DIR "/gnome/help/synaptic/C/synaptic.xml &");
-    }
-#endif
-   else if (is_binary_in_path("mozilla")) {
-      cmd = "mozilla " PACKAGE_DATA_DIR "/synaptic/html/index.html";
-   } else if (is_binary_in_path("konqueror")) {
-      cmd = "konqueror " PACKAGE_DATA_DIR "/synaptic/html/index.html";
+   // FIXME: move this into rgutils as well (or rgspawn.cc)
+   vector<const gchar*> cmd;
+   if (is_binary_in_path("yelp")) {
+      cmd.push_back("yelp");
+      cmd.push_back("ghelp:synaptic");
    } else {
+      cmd = GetBrowserCommand(PACKAGE_DATA_DIR "/synaptic/html/index.html");
+   }
+
+   if (cmd.empty()) {
       me->_userDialog->error(_("No help viewer is installed!\n\n"
                                "You need either the GNOME help viewer 'yelp', "
-                               "the 'konqueror' browser or the 'mozilla' "
+                               "the 'konqueror' browser or the 'firefox' "
                                "browser to view the synaptic manual.\n\n"
                                "Alternatively you can open the man page "
                                "with 'man synaptic' from the "
                                "command line or view the html version located "
                                "in the 'synaptic/html' folder."));
-   }
-
-   if (!cmd.empty()) {
-      gchar * sudo_user;
-      sudo_user = g_strdup(getenv("SUDO_USER"));
-      // if gksu is not found or SUDO_USER is not set, run the help viewer anyway
-      if(is_binary_in_path("sudo") && (sudo_user != NULL))
-         cmd = "sudo -u " + string(sudo_user) + " " + cmd;
-      g_free(sudo_user);
-      cmd += " &";
-      if(system(cmd.c_str()) < 0) {
-         g_warning(_("An error occured while starting the help viewer\n\tCommand: %s"), cmd.c_str());
-      }
-   }
+      return;
+   }
+   RunAsSudoUserCommand(cmd);
 }
 
 void RGMainWindow::cbCloseFilterManagerAction(void *self, bool okcancel)
@@ -2763,8 +2754,6 @@
 
 void RGMainWindow::cbPkgReconfigureClicked(GtkWidget *self, void *data)
 {
-   char frontend[] = "gnome";
-   char *cmd;
    RGMainWindow *me = (RGMainWindow *) data;
    //cout << "RGMainWindow::pkgReconfigureClicked()" << endl;
 
@@ -2781,9 +2770,15 @@
    }
 
    me->setStatusText(_("Starting package configuration tool..."));
-   cmd = g_strdup_printf("/usr/sbin/dpkg-reconfigure -f%s %s &",
-                         frontend, me->selectedPackage()->name());
-   system(cmd);
+   const gchar *cmd[] = { "/usr/sbin/dpkg-reconfigure",
+                    "-fgnome",
+                    me->selectedPackage()->name(),
+                    NULL };
+   GError *error = NULL;
+   g_spawn_async("/", (gchar**)cmd, NULL, (GSpawnFlags)0, NULL, NULL, NULL, &error);
+   if(error != NULL) {
+      std::cerr << "failed to run dpkg-reconfigure cmd" << std::endl;
+   }
 }
 
 
 
=== modified file 'gtk/rgpackagestatus.cc'
--- gtk/rgpackagestatus.cc	2010-07-29 12:14:32 +0000
+++ gtk/rgpackagestatus.cc	2012-04-10 17:44:21 +0000
@@ -29,33 +29,6 @@
 #include "rgutils.h"
 #include "rgpackagestatus.h"
 
-// helper
-static GdkPixbuf *
-get_gdk_pixbuf(const gchar *name, int size=16)
-{
-   GtkIconTheme *theme;
-   GdkPixbuf *pixbuf;
-   GError *error = NULL;
-
-   theme = gtk_icon_theme_get_default();
-   pixbuf = gtk_icon_theme_load_icon(theme, name, size, 
-				     (GtkIconLookupFlags)0, &error);
-   if (pixbuf == NULL) 
-      std::cerr << "Warning, failed to load: " << name 
-		<< error->message << std::endl;
-
-   return pixbuf;
-}
-
-GtkWidget *get_gtk_image(const gchar *name, int size)
-{
-   GdkPixbuf *buf;
-   buf = get_gdk_pixbuf(name, size);
-   if(!buf)
-      return NULL;
-   return gtk_image_new_from_pixbuf(buf);
-}
-
 // RPackageStatus stuff
 RGPackageStatus RGPackageStatus::pkgStatus;
 
 
=== modified file 'gtk/rgpkgdetails.cc'
--- gtk/rgpkgdetails.cc	2012-02-08 20:39:44 +0000
+++ gtk/rgpkgdetails.cc	2012-04-10 17:44:21 +0000
@@ -181,6 +181,16 @@
    ShowChangelogDialog(parent, pkg);
 }
 
+gboolean RGPkgDetailsWindow::cbOpenHomepage(GtkWidget *button, void* data)
+{
+   RPackage *pkg = (RPackage*)data;
+   std::vector<const gchar*> cmd = GetBrowserCommand(pkg->homepage());
+   std::cerr << "cbOpenHomepage: " << cmd[0] << std::endl;
+   RunAsSudoUserCommand(cmd);
+
+   return TRUE;
+}
+
 void RGPkgDetailsWindow::fillInValues(RGGtkBuilderWindow *me, 
                                       RPackage *pkg,
 				      bool setTitle)
@@ -200,7 +210,17 @@
    me->setTextView("textview_pkgcommon", pkg_summary, true);
    g_free(pkg_summary);
 
-   me->setLabel("label_maintainer", pkg->maintainer());
+   string maintainer = pkg->maintainer();
+   int start_index = maintainer.find("<");
+   int end_index = maintainer.rfind(">");
+   if (start_index != -1 && end_index != -1) {
+       gchar*  maintainer_label = g_markup_printf_escaped("<a href=\"mailto:%s\">%s</a>", maintainer.substr(start_index+1, end_index - start_index - 1).c_str(), maintainer.c_str() );
+       me->setMarkup("label_maintainer", maintainer_label);
+       g_free(maintainer_label);
+   } else {
+       me->setLabel("label_maintainer", pkg->maintainer());
+   }
+   
    me->setPixmap("image_state", RGPackageStatus::pkgStatus.getPixbuf(pkg));
    me->setLabel("label_state", RGPackageStatus::pkgStatus.getLongStatusString(pkg));
    me->setLabel("label_priority", pkg->priority());
@@ -288,6 +308,23 @@
    gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(textview), button, anchor);
    gtk_widget_show(button);
 
+   // add button to open the homepage
+   if (strlen(pkg->homepage())) {
+       gtk_text_buffer_insert(buf, &it, "    ", 1);
+       anchor = gtk_text_buffer_create_child_anchor(buf, &it);
+       button = gtk_link_button_new_with_label("", _("Visit Homepage"));
+       char *homepage_tooltip = g_strdup_printf("Visit %s",
+					     pkg->homepage());
+       g_signal_connect(G_OBJECT(button),"clicked", 
+                    G_CALLBACK(cbOpenHomepage),
+                    pkg);
+       gtk_widget_set_tooltip_text(button, homepage_tooltip);
+       g_free(homepage_tooltip);
+       g_object_set_data(G_OBJECT(button), "me", me);
+       gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(textview), button, anchor);
+       gtk_widget_show(button);
+   }
+
    // show the rest of the description
    gtk_text_buffer_insert(buf, &it, "\n", 1);
    s = utf8(pkg->description());
 
=== modified file 'gtk/rgpkgdetails.h'
--- gtk/rgpkgdetails.h	2012-02-08 20:39:44 +0000
+++ gtk/rgpkgdetails.h	2012-04-10 17:44:21 +0000
@@ -45,6 +45,7 @@
    static void cbShowScreenshot(GtkWidget *button, void *data);
    static void cbShowBigScreenshot(GtkWidget *button, GdkEventButton *event, void *data);
    static void cbShowChangelog(GtkWidget *button, void *data);
+   static gboolean cbOpenHomepage(GtkWidget *button, void *data);
    static void doShowBigScreenshot(RPackage *pkg);
 
  public:
 
=== modified file 'gtk/rgpreferenceswindow.cc'
--- gtk/rgpreferenceswindow.cc	2010-11-16 15:59:34 +0000
+++ gtk/rgpreferenceswindow.cc	2012-04-10 17:44:21 +0000
@@ -48,8 +48,8 @@
 
 const char *RGPreferencesWindow::column_visible_names[] = 
    {_("Status"), _("Supported"), _("Package Name"), _("Section"),
-    _("Component"), _("Installed Version"), _("Available Version"), 
-    _("Installed Size"), _("Download Size"),_("Description"), NULL };
+    _("Component"), _("Installed Version"), _("Latest Version"), 
+    _("Size"), _("Download Size"),_("Description"), NULL };
 
 const gboolean RGPreferencesWindow::column_visible_defaults[] = 
    { TRUE, TRUE, TRUE, FALSE, FALSE, TRUE, TRUE, TRUE, FALSE, TRUE }; 
@@ -650,8 +650,8 @@
    // proxy stuff
    bool useProxy = _config->FindB("Synaptic::useProxy", false);
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object
-                                                  (_builder,"radio_use_proxy")),
-                                                  useProxy);
+                                                  (_builder,"radio_no_proxy")),
+                                                  !useProxy);
    gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object
                             (_builder, "table_proxy")),
                             useProxy);
 
=== modified file 'gtk/rgsummarywindow.cc'
--- gtk/rgsummarywindow.cc	2010-10-07 19:51:48 +0000
+++ gtk/rgsummarywindow.cc	2012-04-10 17:44:21 +0000
@@ -393,6 +393,7 @@
 		      toDowngrade, unAuthenticated,sizeChange);
    lister->getDownloadSummary(dlCount, dlSize);
 
+   gtk_widget_set_visible(_dlonlyB, (dlSize > 0));
 #if 0
    if (held) {
       char *str = ngettext("%d package is locked\n",
 
=== modified file 'gtk/rguserdialog.cc'
--- gtk/rguserdialog.cc	2010-11-12 17:46:13 +0000
+++ gtk/rguserdialog.cc	2012-04-10 17:44:21 +0000
@@ -76,6 +76,9 @@
 				                  _("An error occurred"), 
 				                  _("The following details "
 						    "are provided:")));
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
+   gtk_window_set_icon(GTK_WINDOW(dia), icon);
+
    gtk_widget_set_size_request(dia, 500, 300);
    gtk_window_set_resizable(GTK_WINDOW(dia), TRUE);
    gtk_container_set_border_width(GTK_CONTAINER(dia), 6);
@@ -160,7 +163,9 @@
                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                  gtkmessage, gtkbuttons, "%s", 
 			         NULL);
-   
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
+   gtk_window_set_icon(GTK_WINDOW(dia), icon);
+
    gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG(dia), utf8(msg));
    gtk_container_set_border_width(GTK_CONTAINER(dia), 6);
 
@@ -237,6 +242,8 @@
    }
    _dialog = GTK_WIDGET(gtk_builder_get_object(builder, main_widget));
    assert(_dialog);
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
+   gtk_window_set_icon(GTK_WINDOW(_dialog), icon);
 
    gtk_window_set_position(GTK_WINDOW(_dialog),
 			   GTK_WIN_POS_CENTER_ON_PARENT);
 
=== modified file 'gtk/rgutils.cc'
--- gtk/rgutils.cc	2012-01-05 19:44:16 +0000
+++ gtk/rgutils.cc	2012-04-10 17:44:21 +0000
@@ -34,6 +34,33 @@
 #include "rgutils.h"
 
 
+// helper
+GdkPixbuf *
+get_gdk_pixbuf(const gchar *name, int size)
+{
+   GtkIconTheme *theme;
+   GdkPixbuf *pixbuf;
+   GError *error = NULL;
+
+   theme = gtk_icon_theme_get_default();
+   pixbuf = gtk_icon_theme_load_icon(theme, name, size, 
+				     (GtkIconLookupFlags)0, &error);
+   if (pixbuf == NULL) 
+      std::cerr << "Warning, failed to load: " << name 
+		<< error->message << std::endl;
+
+   return pixbuf;
+}
+
+GtkWidget *get_gtk_image(const gchar *name, int size)
+{
+   GdkPixbuf *buf;
+   buf = get_gdk_pixbuf(name, size);
+   if(!buf)
+      return NULL;
+   return gtk_image_new_from_pixbuf(buf);
+}
+
 void RGFlushInterface()
 {
    XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), False);
@@ -84,6 +111,76 @@
    return S;
 }
 
+std::vector<const gchar*> GetBrowserCommand(const gchar *link)
+{
+   std::vector<const gchar*> cmd;
+   if (FileExists("/usr/bin/xdg-open")) {
+      cmd.push_back("/usr/bin/xdg-open");
+      cmd.push_back(link);
+   } else if (FileExists("/usr/bin/firefox")) {
+      cmd.push_back("/usr/bin/firefox");
+      cmd.push_back(link);
+   } else if (FileExists("/usr/bin/konqueror")) {
+      cmd.push_back("/usr/bin/konqueror");
+      cmd.push_back(link);
+   }
+   return cmd;
+}
+
+bool RunAsSudoUserCommand(std::vector<const gchar*> cmd)
+{
+   std::vector<const gchar*> prefix;
+    gchar *sudo_user;
+
+    if (cmd.empty()) {
+       std::cerr << "Empty command for RunAsSudoUserCommand" << std::endl;
+       return true;
+    }
+
+    // try pkexec first, then sudo
+    sudo_user = getenv("PKEXEC_UID");
+    if (sudo_user == NULL) {
+       sudo_user = getenv("SUDO_USER");
+    }
+#if 0 // does not work for some reason
+    if(FileExists("/usr/bin/pkexec") && sudo_user != NULL)
+    {
+       prefix.push_back("/usr/bin/pkexec");
+       prefix.push_back("--user");
+       prefix.push_back(sudo_user);
+    }
+#endif
+    if(FileExists("/usr/bin/sudo") && sudo_user != NULL)
+    {
+       prefix.push_back("/usr/bin/sudo");
+       prefix.push_back("-u");
+       prefix.push_back(sudo_user);
+    }
+    // insert the prefix string
+    cmd.insert(cmd.begin(), prefix.begin(), prefix.end());
+
+    for(std::vector<const gchar*>::iterator it = cmd.begin();
+        it != cmd.end(); it++)
+       printf("cmd '%s'\n", *it);
+
+    // build the c stract to make g_spawn_async happy
+    char **c_cmd = new char*[cmd.size()+1];
+    int i;
+    for(i=0; i<cmd.size(); i++)
+       c_cmd[i] = (gchar*)cmd[i];
+    c_cmd[i] = NULL;
+
+    GError *error = NULL;
+    g_spawn_async("/", c_cmd, NULL, (GSpawnFlags)0, NULL, NULL, NULL, &error);
+    if (error != NULL) {
+       std::cerr << "Failed to run cmd: " << cmd[0] << std::endl;
+    }
+
+    // and free the memory again
+    delete c_cmd;
+
+    return true;
+}
 
 bool is_binary_in_path(const char *program)
 {
 
=== modified file 'gtk/rgutils.h'
--- gtk/rgutils.h	2012-01-05 19:44:16 +0000
+++ gtk/rgutils.h	2012-04-10 17:44:21 +0000
@@ -52,8 +52,11 @@
 const char *utf8(const char *str);
 
 GtkWidget *get_gtk_image(const char *name, int size=16);
+GdkPixbuf *get_gdk_pixbuf(const gchar *name, int size=16);
 
 std::string SizeToStr(double Bytes);
+bool RunAsSudoUserCommand(std::vector<const gchar *> cmd);
+std::vector<const gchar*> GetBrowserCommand(const gchar *link);
 
 std::string MarkupEscapeString(std::string str);
 std::string MarkupUnescapeString(std::string str);
 
=== modified file 'gtk/rgwindow.cc'
--- gtk/rgwindow.cc	2004-02-07 21:13:29 +0000
+++ gtk/rgwindow.cc	2012-04-10 17:44:21 +0000
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "i18n.h"
 #include "rgwindow.h"
-
+#include "rgutils.h"
 
 bool RGWindow::windowCloseCallback(GtkWidget *window, GdkEvent * event)
 {
@@ -40,6 +40,8 @@
    //std::cout << "RGWindow::RGWindow(string name, bool makeBox)" << endl;
    _win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
    gtk_window_set_title(GTK_WINDOW(_win), (char *)name.c_str());
+   GdkPixbuf *icon = get_gdk_pixbuf( "synaptic" );
+   gtk_window_set_icon(GTK_WINDOW(_win), icon);
 
    gtk_object_set_data(GTK_OBJECT(_win), "me", this);
    gtk_signal_connect(GTK_OBJECT(_win), "delete-event",