← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/10_debian_channel.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/10_debian_channel.diff
1
 
diff -Nur konversation-1.0/konversation/src/config/preferences.cpp konversation-1.0.new/konversation/src/config/preferences.cpp
2
 
--- konversation-1.0/konversation/src/config/preferences.cpp    2006-09-09 10:48:46.000000000 +0200
3
 
+++ konversation-1.0.new/konversation/src/config/preferences.cpp        2006-09-09 10:49:56.000000000 +0200
4
 
@@ -69,14 +69,14 @@
5
 
     mIdentity->setNicknameList(nickList);
6
 
 
7
 
     Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings;
8
 
-    serverGroup->setName("Freenode");
9
 
+    serverGroup->setName("Debian IRC");
10
 
     Konversation::ServerSettings server;
11
 
-    server.setHost("irc.freenode.org");
12
 
-    server.setPort(8001);
13
 
+    server.setHost("irc.debian.org");
14
 
+    server.setPort(7000);
15
 
     serverGroup->addServer(server);
16
 
     serverGroup->setIdentityId(mIdentity->id());
17
 
     Konversation::ChannelSettings channel;
18
 
-    channel.setName("#kde");
19
 
+    channel.setName("#debian");
20
 
     serverGroup->addChannel(channel);
21
 
     serverGroup->setExpanded(false);
22
 
     addServerGroup(serverGroup);