← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_05_default_channels.diff

  • Committer: Bazaar Package Importer
  • Author(s): Sarah Hobbs
  • Date: 2008-11-04 13:23:34 UTC
  • Revision ID: james.westby@ubuntu.com-20081104132334-6bgyscmnnavdgzx4
Tags: 1.1-0ubuntu3
https://launchpad.net/bugs/218958
* Reapply kubuntu_05_default_channels.diff dropped in 1.0.1-6ubuntu1.
* Removed 10_debian_channel.diff added in 1.0.1-6ubuntu1.
* Re-add missing changelog entries that went into a black hole.
* Kubuntu people now go to #kubuntu, not #debian again (LP: #218958), 
  even without kubuntu-default-settings installed.
* This merge should now be correct.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_05_default_channels.diff
 
1
Index: konversation-1.1/konversation/src/config/preferences.cpp
 
2
===================================================================
 
3
--- konversation-1.1.orig/konversation/src/config/preferences.cpp       2008-11-04 13:04:59.000000000 +1100
 
4
+++ konversation-1.1/konversation/src/config/preferences.cpp    2008-11-04 13:05:28.000000000 +1100
 
5
@@ -69,14 +69,14 @@
 
6
     mIdentity->setNicknameList(nickList);
 
7
 
 
8
     Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings;
 
9
-    serverGroup->setName("Freenode");
 
10
+    serverGroup->setName("Ubuntu IRC");
 
11
     Konversation::ServerSettings server;
 
12
-    server.setHost("irc.freenode.org");
 
13
+    server.setHost("irc.ubuntu.com");
 
14
     server.setPort(8001);
 
15
     serverGroup->addServer(server);
 
16
     serverGroup->setIdentityId(mIdentity->id());
 
17
     Konversation::ChannelSettings channel;
 
18
-    channel.setName("#kde");
 
19
+    channel.setName("#kubuntu");
 
20
     serverGroup->addChannel(channel);
 
21
     serverGroup->setExpanded(false);
 
22
     addServerGroup(serverGroup);