org.handhelds.familiar/packages/qpe-gaim/files/vit.patch

   1 Index: qpe-gaim/src/QGaimAccountsWindow.cpp
   2 ===================================================================
   3 --- qpe-gaim.orig/src/QGaimAccountsWindow.cpp   2005-03-06 21:16:47.098868556 +0100
   4 +++ qpe-gaim/src/QGaimAccountsWindow.cpp        2005-03-06 21:16:47.353832369 +0100
   5 @@ -40,6 +40,7 @@
   6  #include <qtimer.h>
   7  #include <qtoolbar.h>
   8  #include <qtoolbutton.h>
   9 +#include <qmessagebox.h>
  10
  11  /**************************************************************************
  12   * QGaimAccountListItem
  13 @@ -525,7 +526,7 @@
  14         if (meter == NULL)
  15                 meter = meters->addConnection(gc);
  16
  17 -       meter->update(QString(text), step, step_count);
  18 +       meter->update(QString::fromUtf8(text), step, step_count);
  19  }
  20
  21  static void
  22 @@ -553,11 +554,19 @@
  23  }
  24
  25  static void
  26 +qGaimReportDisconnected(GaimConnection *gc, const char *text)
  27 +{
  28 +//    if (QMessageBox::critical (NULL, "Disconnected", QString("<p>")+text+QString("</p>"), "Retry", "Cancel") == 0)
  29 +    QMessageBox::critical (NULL, "Disconnected", QString("<p>")+text+QString("</p>"));
  30 +}
  31 +
  32 +static void
  33  qGaimConnNotice(GaimConnection *gc, const char *text)
  34  {
  35         /* XXX */
  36         gc = NULL;
  37         text = NULL;
  38 +//     QMessageBox::information (NULL, "Notice", QString::fromUtf8(text));
  39  }
  40
  41  static GaimConnectionUiOps connUiOps =
  42 @@ -566,7 +575,7 @@
  43         qGaimConnConnected,
  44         qGaimConnDisconnected,
  45         qGaimConnNotice,
  46 -       NULL
  47 +       qGaimReportDisconnected
  48  };
  49
  50  GaimConnectionUiOps *
  51 Index: qpe-gaim/src/QGaimBListWindow.cpp
  52 ===================================================================
  53 --- qpe-gaim.orig/src/QGaimBListWindow.cpp      2005-03-06 21:16:47.099868414 +0100
  54 +++ qpe-gaim/src/QGaimBListWindow.cpp   2005-03-06 21:16:47.354832227 +0100
  55 @@ -428,7 +428,7 @@
  56         dialog = new QGaimAddBuddyDialog(this, "", true);
  57
  58         if (group != NULL)
  59 -               dialog->setGroup(group->name);
  60 +               dialog->setGroup(QString::fromUtf8(group->name));
  61
  62         dialog->showMaximized();
  63  }
  64 @@ -469,7 +469,7 @@
  65         dialog = new QGaimAddChatDialog(this, "", true);
  66
  67         if (group != NULL)
  68 -               dialog->setGroup(group->name);
  69 +               dialog->setGroup(QString::fromUtf8(group->name));
  70
  71         dialog->showMaximized();
  72  }
  73 Index: qpe-gaim/src/QGaimBuddyList.cpp
  74 ===================================================================
  75 --- qpe-gaim.orig/src/QGaimBuddyList.cpp        2005-03-06 21:16:47.101868130 +0100
  76 +++ qpe-gaim/src/QGaimBuddyList.cpp     2005-03-06 21:18:39.073975291 +0100
  77 @@ -131,7 +131,7 @@
  78                         setText(1, text);
  79                 }
  80
  81 -               setText(0, gaim_buddy_get_alias(buddy));
  82 +                setText(0, QString::fromUtf8(gaim_buddy_get_alias(buddy)));
  83         }
  84         else if (GAIM_BLIST_NODE_IS_BUDDY(node))
  85         {
  86 @@ -164,8 +164,8 @@
  87                         text += idle;
  88                 }
  89
  90 -               setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
  91 -               setText(0, gaim_buddy_get_alias(buddy));
  92 +                setPixmap(0, QGaimBuddyList::getBuddyStatusIcon(node, pixmapSize));
  93 +                setText(0, QString::fromUtf8(gaim_buddy_get_alias(buddy)));
  94                 setText(1, text);
  95         }
  96         else if (GAIM_BLIST_NODE_IS_CHAT(node))
  97 @@ -325,9 +325,9 @@
  98                                         statusText = QObject::tr("Offline ");
  99
 100                                 if (contact != NULL && !isExpanded() && contact->alias != NULL)
 101 -                                       topText = contact->alias;
 102 +                                    topText = QString::fromUtf8(contact->alias);
 103                                 else
 104 -                                       topText = gaim_buddy_get_alias(buddy);
 105 +                                    topText = QString::fromUtf8(gaim_buddy_get_alias(buddy));
 106
 107                                 bottomText = statusText + idleTime + warning;
 108
 109 @@ -401,7 +401,7 @@
 110         QString groupName, detail;
 111         QFont f = p->font();
 112
 113 -       groupName = group->name;
 114 +       groupName = QString::fromUtf8(group->name);
 115
 116         if (gaim_prefs_get_bool("/gaim/qpe/blist/show_group_count"))
 117         {
 118 Index: qpe-gaim/src/QGaimConnectionMeter.cpp
 119 ===================================================================
 120 --- qpe-gaim.orig/src/QGaimConnectionMeter.cpp  2005-03-06 21:16:47.101868130 +0100
 121 +++ qpe-gaim/src/QGaimConnectionMeter.cpp       2005-03-06 21:16:47.355832086 +0100
 122 @@ -74,14 +74,12 @@
 123  }
 124
 125  void
 126 -QGaimConnectionMeter::update(QString, int progress, int totalSteps)
 127 +QGaimConnectionMeter::update(QString str, int progress, int totalSteps)
 128  {
 129         if (progress == 0)
 130                 progressBar->setTotalSteps(totalSteps);
 131
 132         progressBar->setProgress(progress);
 133 -
 134 -//     progressBar->setIndicator(str, progress, totalSteps);
 135  }
 136
 137  GaimConnection *
 138 Index: qpe-gaim/src/QGaimConvWindow.cpp
 139 ===================================================================
 140 --- qpe-gaim.orig/src/QGaimConvWindow.cpp       2005-03-06 21:16:47.103867846 +0100
 141 +++ qpe-gaim/src/QGaimConvWindow.cpp    2005-03-06 21:16:47.357831802 +0100
 142 @@ -93,7 +93,7 @@
 143         if (flags & GAIM_MESSAGE_SYSTEM)
 144         {
 145                 txt  = "<b>";
 146 -               txt += message;
 147 +               txt += QString::fromUtf8(message);
 148                 txt += "</b><br>\n";
 149         }
 150         else
 151 @@ -109,13 +109,13 @@
 152                         if (meify(newMessage, length))
 153                         {
 154                                 nick  = "***";
 155 -                               nick += who;
 156 +                               nick += QString::fromUtf8(who);
 157                                 color = "#6C2585";
 158                         }
 159                         else
 160                         {
 161                                 nick  = "*";
 162 -                               nick += who;
 163 +                               nick += QString::fromUtf8(who);
 164                                 nick += "*:";
 165                                 color = "#00FF00";
 166                         }
 167 @@ -129,7 +129,7 @@
 168                                 else
 169                                         nick = "***";
 170
 171 -                               nick += who;
 172 +                               nick += QString::fromUtf8(who);
 173
 174                                 if (flags & GAIM_MESSAGE_NICK)
 175                                         color = "#AF7F00";
 176 @@ -138,7 +138,7 @@
 177                         }
 178                         else
 179                         {
 180 -                               nick = who;
 181 +                               nick = QString::fromUtf8(who);
 182
 183                                 if (flags & GAIM_MESSAGE_AUTO_RESP)
 184                                         nick += "&lt;AUTO-REPLY&gt; :";
 185 @@ -158,7 +158,7 @@
 186                 txt += nick;
 187                 txt += "</b></font> ";
 188
 189 -               txt += stripFontFace(newMessage);
 190 +               txt += stripFontFace(QString::fromUtf8(newMessage));
 191                 txt += "<br>\n";
 192
 193                 g_free(newMessage);
 194 @@ -353,7 +353,7 @@
 195         else
 196                 item->setText(0, " ");
 197
 198 -       item->setText(1, user);
 199 +       item->setText(1, QString::fromUtf8(user));
 200         userList->insertItem(item);
 201  }
 202
 203 @@ -373,9 +373,9 @@
 204                  item != NULL;
 205                  item = item->nextSibling())
 206         {
 207 -               if (item->text(1) == oldName)
 208 +               if (item->text(1) == QString::fromUtf8(oldName))
 209                 {
 210 -                       item->setText(1, newName);
 211 +                       item->setText(1, QString::fromUtf8(newName));
 212                         break;
 213                 }
 214         }
 215 @@ -390,7 +390,7 @@
 216                  item != NULL;
 217                  item = item->nextSibling())
 218         {
 219 -               if (item->text(1) == user)
 220 +               if (item->text(1) == QString::fromUtf8(user))
 221                 {
 222                         delete item;
 223                         break;
 224 @@ -473,7 +473,7 @@
 225         if (text[text.length() - 1] == '\n')
 226                 text.remove(text.length() - 1, 1);
 227
 228 -       gaim_conv_chat_send(GAIM_CONV_CHAT(conv), text);
 229 +       gaim_conv_chat_send(GAIM_CONV_CHAT(conv), text.utf8());
 230
 231         entry->setText("");
 232  }
 233 @@ -650,7 +650,7 @@
 234         if (text[text.length() - 1] == '\n')
 235                 text.remove(text.length() - 1, 1);
 236
 237 -       gaim_conv_im_send(GAIM_CONV_IM(conv), text);
 238 +       gaim_conv_im_send(GAIM_CONV_IM(conv), text.utf8());
 239
 240         entry->setText("");
 241
 242 @@ -995,7 +995,7 @@
 243                 int result = QMessageBox::information(this,
 244                                 tr("Remove Buddy"),
 245                                 tr("<p>You are about to remove %1 from your buddy list.</p>\n"
 246 -                                  "<p>Do you want to continue?</p>").arg(name),
 247 +                                  "<p>Do you want to continue?</p>").arg(QString::fromUtf8(name)),
 248                                 tr("&Remove Buddy"), tr("&Cancel"),
 249                                 QString::null, 1, 1);
 250
 251 Index: qpe-gaim/src/QGaimDialogs.cpp
 252 ===================================================================
 253 --- qpe-gaim.orig/src/QGaimDialogs.cpp  2005-03-06 21:16:47.105867562 +0100
 254 +++ qpe-gaim/src/QGaimDialogs.cpp       2005-03-06 21:16:47.358831660 +0100
 255 @@ -141,7 +141,7 @@
 256                         {
 257                                 GaimGroup *g = (GaimGroup *)node;
 258
 259 -                               groupCombo->insertItem(g->name);
 260 +                               groupCombo->insertItem(QString::fromUtf8(g->name));
 261                         }
 262                 }
 263         }
 264 @@ -151,9 +151,9 @@
 265  QGaimAddBuddyDialog::accept()
 266  {
 267         GaimConversation *conv;
 268 -       QString screenname = screenNameEntry->text();
 269 -       QString alias = aliasEntry->text();
 270 -       QString group_name = groupCombo->currentText();
 271 +       QString screenname = screenNameEntry->text().utf8();
 272 +       QString alias = aliasEntry->text().utf8();
 273 +       QString group_name = groupCombo->currentText().utf8();
 274         GaimAccount *account;
 275         GaimBuddy *buddy;
 276         GaimGroup *group;
 277 @@ -290,7 +290,7 @@
 278                         {
 279                                 GaimGroup *g = (GaimGroup *)node;
 280
 281 -                               groupCombo->insertItem(g->name);
 282 +                               groupCombo->insertItem(QString::fromUtf8(g->name));
 283                         }
 284                 }
 285         }
 286 @@ -371,8 +371,8 @@
 287         GaimGroup *group;
 288         GList *chatInfoList, *l;
 289         GHashTable *components;
 290 -       QString alias = aliasEntry->text();
 291 -       QString groupName = groupCombo->currentText();
 292 +       QString alias = aliasEntry->text().utf8();
 293 +       QString groupName = groupCombo->currentText().utf8();
 294         QWidget *widget;
 295         struct proto_chat_entry *pce;
 296
 297 @@ -495,7 +495,7 @@
 298  void
 299  QGaimNewImDialog::accept()
 300  {
 301 -       QString screenname = screenNameEntry->text();
 302 +       QString screenname = screenNameEntry->text().utf8();
 303         GaimAccount *account;
 304         GaimConversation *conv;
 305
 306 Index: qpe-gaim/src/QGaimRequest.cpp
 307 ===================================================================
 308 --- qpe-gaim.orig/src/QGaimRequest.cpp  2005-03-06 21:16:47.109866995 +0100
 309 +++ qpe-gaim/src/QGaimRequest.cpp       2005-03-06 21:16:47.358831660 +0100
 310 @@ -68,7 +68,7 @@
 311         dialog->setInfoText(message);
 312
 313         if (defaultValue != NULL)
 314 -               dialog->setDefaultValue(defaultValue);
 315 +               dialog->setDefaultValue(QString::fromUtf8(defaultValue));
 316
 317         if (masked)
 318                 dialog->setMasked();
 319 @@ -85,7 +85,7 @@
 320         if (result == 1)
 321         {
 322                 if (okCb != NULL)
 323 -                       ((GaimRequestInputCb)okCb)(userData, dialog->getText());
 324 +                       ((GaimRequestInputCb)okCb)(userData, dialog->getText().utf8());
 325         }
 326         else if (cancelCb != NULL)
 327                 ((GaimRequestInputCb)cancelCb)(userData, NULL);