gg-debian_fixes.patch

   1 --- gg-1.0.0rel.orig/src/callbacks.c    2003-01-31 10:39:08.000000000 +0100
   2 +++ gg-1.0.0rel/src/callbacks.c 2003-06-29 02:51:27.000000000 +0200
   3 @@ -237,7 +237,10 @@
   4
   5             config.uin = atoi(tmpuin);
   6             config.password = g_strdup(tmppass);
   7 -           write_config();
   8 +           if (! write_config()) {
   9 +               show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
  10 +               return;
  11 +           }
  12
  13         } else {
  14             GtkWidget *register_dialog = create_register();
  15 @@ -696,12 +699,10 @@
  16  void on_zapisz_ustawienia_activate(GtkMenuItem * menuitem,
  17                                    gpointer user_data)
  18  {
  19 -       write_config();
  20 -       write_contacts();
  21 -
  22 -       show_message_dialog("Ustawienia zosta³y zapisane!");
  23 -
  24 -       return;
  25 +       if ((! write_config()) || (! write_contacts()))
  26 +               show_error_dialog("Nie uda³o siê zapisaæ ustawieñ!");
  27 +       else
  28 +               show_message_dialog("Ustawienia zosta³y zapisane!");
  29  }
  30
  31  void on_dodaj_clicked(GtkButton * button, GtkWidget * dialog)
  32 @@ -1113,7 +1114,8 @@
  33                 config.away_msg_ask = 0;
  34         }
  35
  36 -       write_config();
  37 +       if (! write_config())
  38 +               show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
  39
  40  #ifndef USE_GNOME
  41         gtk_widget_destroy(dialog);
  42 @@ -1352,7 +1354,8 @@
  43         // FIXME: jaki tu powinien byæ naprawde poprzedni status
  44         change_kontakt_status(kontakt, GG_STATUS_OFFLINE);
  45         gtk_widget_destroy(edycja);
  46 -       write_contacts();
  47 +       if (! write_contacts())
  48 +               show_error_dialog("Nie uda³o siê zapisaæ listy kontaktów!");
  49  }
  50  static void on_ignore_restore(GtkMenuItem * menuitem, guint * uin)
  51  {
  52 @@ -1552,8 +1555,17 @@
  53  applet_save_session(GtkWidget * widget,
  54                     const gchar * privcfgpath, const gchar * globcfgpath)
  55  {
  56 -       write_config();
  57 -       write_contacts();
  58 +       /*
  59 +        * Looks like there's no way to indicate that session saving failed.
  60 +        * At least warn the user if it does fail.
  61 +        */
  62 +       if ((! write_config()) || (! write_contacts())) {
  63 +               show_error_dialog("Zapisywanie ustawieñ nie uda³o siê."
  64 +                                 "Spróbuj usun±æ problem - "
  65 +                                 "próba zapisania zostanie ponowiona.");
  66 +               write_config();
  67 +               write_contacts();
  68 +       }
  69  #ifdef DEBUG
  70         g_print("applet_save_session(): session saved.\n");
  71  #endif
  72 @@ -1862,11 +1874,15 @@
  73      }
  74
  75      while (fgets(buf, 1024, in)) {
  76 -       fputs(buf, out);
  77 +       if (fputs(buf, out) == EOF) {
  78 +           show_error_dialog("Nie uda³o siê zapisaæ ca³ego pliku");
  79 +           return;
  80 +       }
  81      }
  82
  83      fclose(in);
  84 -    fclose(out);
  85 +    if (fclose(out) == EOF)
  86 +        show_error_dialog("Nie uda³o siê zapisaæ ca³ego pliku");
  87  }
  88
  89  void on_zapisz_jako_clicked(GtkButton * button, gpointer user_data)
  90 diff -ruN gg-1.0.0rel.orig/src/dock.c gg-1.0.0rel/src/dock.c
  91 --- gg-1.0.0rel.orig/src/dock.c 2002-11-13 10:33:23.000000000 +0100
  92 +++ gg-1.0.0rel/src/dock.c      2003-06-29 02:52:46.000000000 +0200
  93 @@ -115,8 +115,17 @@
  94                          const gchar * privcfgpath,
  95                          const gchar * globcfgpath)
  96  {
  97 -       write_config();
  98 -       write_contacts();
  99 +       /*
 100 +        * Looks like there's no way to indicate that session saving failed.
 101 +        * At least warn the user if it does fail.
 102 +        */
 103 +       if ((! write_config()) || (! write_contacts())) {
 104 +               show_error_dialog("Zapisywanie ustawieñ nie uda³o siê."
 105 +                                 "Spróbuj usun±æ problem - "
 106 +                                 "próba zapisania zostanie ponowiona.");
 107 +               write_config();
 108 +               write_contacts();
 109 +       }
 110
 111         g_print("applet_save_session(): session saved.\n");
 112
 113 diff -ruN gg-1.0.0rel.orig/src/gg-types.h gg-1.0.0rel/src/gg-types.h
 114 --- gg-1.0.0rel.orig/src/gg-types.h     2003-01-27 12:58:08.000000000 +0100
 115 +++ gg-1.0.0rel/src/gg-types.h  2003-06-29 02:58:14.000000000 +0200
 116 @@ -282,7 +282,7 @@
 117
 118  void read_config(void);
 119
 120 -void write_config(void);
 121 +int write_config(void);
 122
 123  int write_contacts(void);
 124
 125 diff -ruN gg-1.0.0rel.orig/src/gg.c gg-1.0.0rel/src/gg.c
 126 --- gg-1.0.0rel.orig/src/gg.c   2003-01-27 12:58:08.000000000 +0100
 127 +++ gg-1.0.0rel/src/gg.c        2003-06-29 02:56:47.000000000 +0200
 128 @@ -513,7 +513,9 @@
 129         g_free(lognick);
 130         g_free(timestamp1);
 131         g_free(timestamp2);
 132 -       fclose(fp);
 133 +       if (fclose(fp) == EOF)
 134 +               show_error_dialog("Nie uda³o siê dopisaæ wiadomo¶ci "
 135 +                                 "do historii rozmów.");
 136  }
 137
 138  void gg_recv_msg(GGCmd * cmd)
 139 @@ -1142,7 +1144,8 @@
 140                 show_error_dialog("B³±d podczas zmiany has³a!!!");
 141         } else {
 142                 show_message_dialog("Has³o zosta³o zmienione!");
 143 -               write_config();
 144 +               if (! write_config())
 145 +                   show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
 146         }
 147  }
 148
 149 @@ -1227,7 +1230,8 @@
 150                 show_error_dialog(_("B³±d podczas rejestracji u¿ytkownika"));
 151         } else {
 152                 show_message_dialog(_("Nowy u¿ytkownik zosta³ zarejestrowany"));
 153 -               write_config();
 154 +               if (! write_config())
 155 +                   show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
 156         }
 157  }
 158
 159 @@ -1394,7 +1398,8 @@
 160                     cp_to_iso(tmpline);
 161                     show_message_dialog(tmpline);
 162                     config.last_sysmsg = strlen(tmpline);
 163 -                   write_config();
 164 +                   if (! write_config())
 165 +                       show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
 166                 }
 167                 g_strfreev(info);
 168                 g_strfreev(addr);
 169 @@ -1835,7 +1840,8 @@
 170  //    fprintf(fp, "%s\n", (r->familycity) ? r->familycity : "");
 171  //    fprintf(fp, "%s\n", (r->familyname) ? r->familyname : "");
 172
 173 -    fclose(fp);
 174 +    if (fclose(fp) == EOF)
 175 +        g_warning("Nie uda³o siê zapisaæ katalogu publicznego do pliku!");
 176
 177      return 0;
 178  }
 179 diff -ruN gg-1.0.0rel.orig/src/gg.h gg-1.0.0rel/src/gg.h
 180 --- gg-1.0.0rel.orig/src/gg.h   2003-01-25 16:46:02.000000000 +0100
 181 +++ gg-1.0.0rel/src/gg.h        2003-06-29 03:21:10.000000000 +0200
 182 @@ -254,4 +254,4 @@
 183  void free_contact(GGContact *k);
 184
 185  void gg_new_msg_animate_off();
 186 -#endif
 187 \ Brak znaku nowej linii na koñcu pliku
 188 +#endif
 189 diff -ruN gg-1.0.0rel.orig/src/main.c gg-1.0.0rel/src/main.c
 190 --- gg-1.0.0rel.orig/src/main.c 2002-12-01 22:17:22.000000000 +0100
 191 +++ gg-1.0.0rel/src/main.c      2003-06-29 03:24:33.000000000 +0200
 192 @@ -82,12 +82,14 @@
 193  int write_contacts()
 194  {
 195         gchar *path;
 196 +       gchar *tmp_path;
 197         FILE *fp;
 198         GList *tmplist;
 199
 200         path = g_strconcat(config.homedir, "/userlist", NULL);
 201 +       tmp_path = g_strdup_printf("%s.%d.%ld", path, (int) getpid(), (long) time(NULL));
 202
 203 -       fp = fopen(path, "w");
 204 +       fp = fopen(tmp_path, "w");
 205
 206         if (!fp) {
 207                 g_print
 208 @@ -116,7 +118,22 @@
 209
 210                 tmplist = tmplist->next;
 211         }
 212 -       fclose(fp);
 213 +       if (fclose(fp) == EOF) {
 214 +               unlink(tmp_path);
 215 +               g_free(path);
 216 +               g_free(tmp_path);
 217 +               return 0;
 218 +       }
 219 +
 220 +       if (rename(tmp_path, path) == -1) {
 221 +               unlink(tmp_path);
 222 +               g_free(path);
 223 +               g_free(tmp_path);
 224 +               return 0;
 225 +       }
 226 +
 227 +       g_free(path);
 228 +       g_free(tmp_path);
 229         return 1;
 230  }
 231
 232 @@ -292,7 +309,10 @@
 233                 fp = fopen(path, "r");
 234                 if (!fp) {
 235                     g_warning("Cannot read config file. Using defaults.");
 236 -                   write_config();
 237 +                   if (! write_config()) {
 238 +                       g_error("Cannot write new config file!");
 239 +                       exit(1);
 240 +                   }
 241                     return;
 242                 }
 243         }
 244 @@ -467,10 +487,11 @@
 245         fclose(fp);
 246  }
 247
 248 -void write_config()
 249 +int write_config()
 250  {
 251         FILE *fp;
 252         gchar *path;
 253 +       gchar *tmp_path;
 254         GList *tmp_list;
 255         gchar *tmp;
 256
 257 @@ -479,13 +500,16 @@
 258             config.height=window->allocation.height;
 259         }
 260         path = g_strconcat(config.homedir, "/config", NULL);
 261 +       tmp_path = g_strdup_printf("%s.%d.%ld", path, (int) getpid(), (long) time(NULL));
 262
 263 -       fp = fopen(path, "w");
 264 +       fp = fopen(tmp_path, "w");
 265
 266         if (fp == NULL) {
 267 +               g_free(path);
 268 +               g_free(tmp_path);
 269                 g_warning
 270                     ("write_config(): Cannot write config file. Giving up.");
 271 -               return;
 272 +               return 0;
 273         }
 274
 275         chmod(path, S_IRUSR | S_IWUSR);
 276 @@ -566,8 +590,23 @@
 277                 fprintf(fp, "ignore %d\n", *(guint *) tmp_list->data);
 278                 tmp_list = tmp_list->next;
 279         }
 280 -       fclose(fp);
 281 -       free(path);
 282 +       if (fclose(fp) == EOF) {
 283 +               unlink(tmp_path);
 284 +               g_free(path);
 285 +               g_free(tmp_path);
 286 +               return 0;
 287 +       }
 288 +
 289 +       if (rename(tmp_path, path) == -1) {
 290 +               unlink(tmp_path);
 291 +               g_free(path);
 292 +               g_free(tmp_path);
 293 +               return 0;
 294 +       }
 295 +
 296 +       g_free(path);
 297 +       g_free(tmp_path);
 298 +       return 1;
 299  }
 300
 301  /* na razie ma³o przdatne ;-) */
 302 @@ -597,10 +636,16 @@
 303  void shutdown_gg()
 304  {
 305         if (config.save_config_on_exit) {
 306 -           write_config();
 307 +           if (! write_config()) {
 308 +               show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
 309 +               return;
 310 +           }
 311         }
 312         if (config.save_contacts_on_exit) {
 313 -           write_contacts();
 314 +           if (! write_contacts()) {
 315 +               show_error_dialog("Nie uda³o siê zapisaæ listy kontaktów!");
 316 +               return;
 317 +           }
 318         }
 319
 320  #ifdef USE_APPLET
 321 diff -ruN gg-1.0.0rel.orig/src/preferences.c gg-1.0.0rel/src/preferences.c
 322 --- gg-1.0.0rel.orig/src/preferences.c  2002-11-27 17:52:02.000000000 +0100
 323 +++ gg-1.0.0rel/src/preferences.c       2003-06-29 02:57:34.000000000 +0200
 324 @@ -206,7 +206,8 @@
 325         }
 326
 327
 328 -       write_config();
 329 +       if (! write_config())
 330 +               show_error_dialog("Nie uda³o siê zapisaæ konfiguracji!");
 331
 332  #ifndef USE_GNOME
 333         gtk_widget_destroy(dialog);
 334 diff -ruN gg-1.0.0rel.orig/src/search.c gg-1.0.0rel/src/search.c
 335 --- gg-1.0.0rel.orig/src/search.c       2003-02-16 21:09:03.000000000 +0100
 336 +++ gg-1.0.0rel/src/search.c    2003-06-29 03:29:29.000000000 +0200
 337 @@ -157,7 +157,7 @@
 338
 339             gtk_clist_clear(GTK_CLIST(wyniki_lista));
 340             if (wyniki_kontakty) {
 341 -               GList *tmplist;
 342 +               GList *tmplist = wyniki_kontakty;
 343                 while (tmplist) {
 344                     GGContact *k = tmplist->data;
 345                     free_contact(k);
 346 diff -ruN gg-1.0.0rel.orig/src/search.h gg-1.0.0rel/src/search.h
 347 --- gg-1.0.0rel.orig/src/search.h       2003-01-25 16:46:02.000000000 +0100
 348 +++ gg-1.0.0rel/src/search.h    2003-06-29 03:24:43.000000000 +0200
 349 @@ -35,4 +35,4 @@
 350  guint gg_search50_next(gg_search50_t res);
 351  guint32 gg_search50_seq(gg_search50_t res);
 352  void gg_search50_free(gg_search50_t res);
 353 -int gg_search50_handle_reply(gg_search50_t res, const char *packet, int length);
 354 \ Brak znaku nowej linii na koñcu pliku
 355 +int gg_search50_handle_reply(gg_search50_t res, const char *packet, int length);
 356 diff -ruN gg-1.0.0rel.orig/src/sound-arts.cpp gg-1.0.0rel/src/sound-arts.cpp
 357 --- gg-1.0.0rel.orig/src/sound-arts.cpp 2002-05-08 14:33:35.000000000 +0200
 358 +++ gg-1.0.0rel/src/sound-arts.cpp      2003-06-29 03:29:44.000000000 +0200
 359 @@ -72,4 +72,4 @@
 360         return server.play(absolutePath(filename)) != 0;
 361  }
 362
 363 -#endif HAVE_ARTS
 364 +#endif /* HAVE_ARTS */
 365 diff -ruN gg-1.0.0rel.orig/src/sound-arts.h gg-1.0.0rel/src/sound-arts.h
 366 --- gg-1.0.0rel.orig/src/sound-arts.h   2002-05-08 14:33:35.000000000 +0200
 367 +++ gg-1.0.0rel/src/sound-arts.h        2003-06-29 03:35:36.000000000 +0200
 368 @@ -16,4 +16,4 @@
 369  }
 370  #endif
 371
 372 -#endif /* HAVE_ARTS */
 373 \ Brak znaku nowej linii na koñcu pliku
 374 +#endif /* HAVE_ARTS */