Merge lp:~gothicx/apport/active_btns_tab into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

[Martin Pitt (pitti)]

Looks good, with the -p/-P changes reverted. Please base unrelated branches off trunk, not off another branch of your's, since that introduces unnecessary dependencies.

review: Approve

=== modified file 'apport/ui.py'
--- apport/ui.py	2009-10-12 07:07:45 +0000
+++ apport/ui.py	2009-10-12 21:30:24 +0000
@@ -433,6 +433,12 @@
             return True
         elif self.options.filebug:
             return self.run_report_bug()
+        elif self.options.package:
+            print _('Usage: ubuntu-bug <package>\nThe option -p, --package <package> is deprecated, please do not use it.')
+            return True
+        elif self.options.pid:
+            print _('Usage: ubuntu-bug <pid>\nThe option -P, --pid <pid> is deprecated, please do not use it.')
+            return True
         elif self.options.version:
             print __version__
             return True
@@ -465,10 +471,10 @@
             help=_('File a bug report about a symptom. (Implied if symptom name is given as only argument.)'), 
             dest='symptom')
         optparser.add_option('-p', '--package',
-            help=_('Specify package name in --file-bug mode. This is optional if a --pid is specified. (Implied if package name is given as only argument.)'),
+            help=_('Specify package name in --file-bug mode. This is optional if a --pid is specified. (Implied if package name is given as only argument.) [deprecated]'),
             action='store', type='string', dest='package', default=None)
         optparser.add_option('-P', '--pid',
-            help=_('Specify a running program in --file-bug mode. If this is specified, the bug report will contain more information. (Implied if pid is given as only argument.)'),
+            help=_('Specify a running program in --file-bug mode. If this is specified, the bug report will contain more information. (Implied if pid is given as only argument.) [deprecated]'),
             action='store', type='int', dest='pid', default=None)
         optparser.add_option('-c', '--crash-file',
             help=_('Report the crash from given .apport or .crash file instead of the pending ones in %s. (Implied if file is given as only argument.)') % apport.fileutils.report_dir,

=== modified file 'bin/apport-bug'
--- bin/apport-bug	2009-10-04 21:45:02 +0000
+++ bin/apport-bug	2009-10-12 21:30:24 +0000
@@ -40,7 +40,13 @@
 
 find_programs
 
-if [ "$#" -gt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
+if [ "$1" = "-p" ] || [ "$1" = "--package" ]; then
+    echo "Usage: ubuntu-bug <package>\nThe option -p, --package <package> is deprecated, please do not use it."
+    exit 1
+elif [ "$1" = "-P" ] || [ "$1" = "--pid" ]; then
+    echo "Usage: ubuntu-bug <pid>\nThe option -P, --pid <pid> is deprecated, please do not use it."
+    exit 1
+elif [ "$#" -gt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
     echo "Usage: $0 <pid>|<symptom name>|<package name>|<program path>|<.crash file>" >&2
     exit 1
 fi

=== modified file 'gtk/apport-gtk.ui'
--- gtk/apport-gtk.ui	2009-06-19 10:44:35 +0000
+++ gtk/apport-gtk.ui	2009-10-12 21:30:24 +0000
@@ -509,7 +509,7 @@
               <object class="GtkButton" id="button4">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
               </object>
@@ -523,7 +523,7 @@
               <object class="GtkButton" id="button6">
                 <property name="label" translatable="yes">_Send Report</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>