Merge lp:~paulbrianstewart/ubuntu/oneiric/quassel/833751-String-Error-Fix into lp:ubuntu/oneiric/quassel

[Paul Stewart]

* Changed the message to "You need at least 0.6 quasselcore to use this feature"

* Changed the message to "You need at least 0.6 quasselcore to use this feature" in chatviewsettingspage.cpp, line 44

[Scott Moser (smoser)]

Paul,
  Thank you for taking the time to submit a merge proposal for this bug.
  However, as Scott K mentioned in bug 833751, these sort of changes are best made in the project upstream.

  It would be best if you
  * filed a bug at http://bugs.quassel-irc.org/projects/quassel-irc/issues?set_filter=1&tracker_id=1
  * linked to the new bug from the launchpad bug
  * removed this merge proposal, or marked it as "work in progress" (so it does not show up in the sponsoring queue).

  Thanks again for your effort. I do not want to sound ungrateful, but carrying a patch like this for a trivial change is work for Ubuntu that is better fixed upstream, so all users of the project can benefit.

review: Disapprove

[Paul Stewart (paulbrianstewart)]

> Paul,
> Thank you for taking the time to submit a merge proposal for this bug.
> However, as Scott K mentioned in bug 833751, these sort of changes are best
> made in the project upstream.
>
> It would be best if you
> * filed a bug at http://bugs.quassel-irc.org/projects/quassel-
> irc/issues?set_filter=1&tracker_id=1
> * linked to the new bug from the launchpad bug
> * removed this merge proposal, or marked it as "work in progress" (so it
> does not show up in the sponsoring queue).
>
> Thanks again for your effort. I do not want to sound ungrateful, but
> carrying a patch like this for a trivial change is work for Ubuntu that is
> better fixed upstream, so all users of the project can benefit.

No problem,

I will do as you mention above. Apologies for making more work for you guys.
Thanks
Paul

Unmerged revisions

80. By Paul Stewart on 2011-08-26

* Changed the message to "You need at least 0.6 quasselcore to use this feature"

=== modified file 'src/qtui/settingspages/chatviewsettingspage.cpp'
--- src/qtui/settingspages/chatviewsettingspage.cpp	2010-08-11 12:48:08 +0000
+++ src/qtui/settingspages/chatviewsettingspage.cpp	2011-08-26 05:31:23 +0000
@@ -38,7 +38,7 @@
   if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
     ui.autoMarkerLine->setEnabled(false);
     ui.autoMarkerLine->setChecked(true);
-    ui.autoMarkerLine->setToolTip(tr("You need at 0.6 quasselcore to use this feature"));
+    ui.autoMarkerLine->setToolTip(tr("You need at least 0.6 quasselcore to use this feature"));
   }
 
   initAutoWidgets();