pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #128313 from fortuneteller2k/pan

pan: fix build and format

authored by Sandro and committed by GitHub d89b8ce9 a06aeca3

+1142 -13
unified split
+29 -13
pkgs/applications/networking/newsreaders/pan/default.nix
··· 1 1 { spellChecking ? true 2 - , lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null 3 - , gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls 4 - , makeWrapper, gnupg 5 - , gnomeSupport ? true, libsecret, gcr 2 + , lib 3 + , stdenv 4 + , fetchurl 5 + , pkg-config 6 + , gtk3 7 + , gtkspell3 8 + , gmime2 9 + , gettext 10 + , intltool 11 + , itstool 12 + , libxml2 13 + , libnotify 14 + , gnutls 15 + , makeWrapper 16 + , gnupg 17 + , gnomeSupport ? true 18 + , libsecret 19 + , gcr 6 20 }: 7 21 8 - assert spellChecking -> gtkspell3 != null; 9 - 10 - let version = "0.146"; in 11 - 12 - stdenv.mkDerivation { 22 + stdenv.mkDerivation rec { 13 23 pname = "pan"; 14 - inherit version; 24 + version = "0.146"; 15 25 16 26 src = fetchurl { 17 - url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; 27 + url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; 18 28 sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; 19 29 }; 20 30 31 + patches = [ 32 + # Take <glib.h>, <gmime.h>, "gtk-compat.h" out of extern "C" 33 + ./move-out-of-extern-c.diff 34 + ]; 35 + 21 36 nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; 37 + 22 38 buildInputs = [ gtk3 gmime2 libnotify gnutls ] 23 39 ++ lib.optional spellChecking gtkspell3 24 40 ++ lib.optionals gnomeSupport [ libsecret gcr ]; ··· 29 45 "--with-gnutls" 30 46 "--enable-libnotify" 31 47 ] ++ lib.optional spellChecking "--with-gtkspell" 32 - ++ lib.optional gnomeSupport "--enable-gkr"; 48 + ++ lib.optional gnomeSupport "--enable-gkr"; 33 49 34 50 postInstall = '' 35 51 wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin ··· 42 58 homepage = "http://pan.rebelbase.com/"; 43 59 maintainers = [ maintainers.eelco ]; 44 60 platforms = platforms.linux; 45 - license = with licenses; [ gpl2 fdl11 ]; 61 + license = with licenses; [ gpl2Only fdl11 ]; 46 62 }; 47 63 }
+1113
pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff
··· 1 + diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc 2 + index b06d0c2..f424738 100644 3 + --- a/pan/data-impl/article-filter.cc 4 + +++ b/pan/data-impl/article-filter.cc 5 + @@ -25,10 +25,7 @@ 6 + #include <gmime/gmime.h> 7 + 8 + //#include <glib/gprintf.h> 9 + -extern "C" 10 + -{ 11 + - #include <glib.h> 12 + -} 13 + +#include <glib.h> 14 + 15 + #include "article-filter.h" 16 + 17 + diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc 18 + index 88012cc..4465966 100644 19 + --- a/pan/data-impl/data-impl.cc 20 + +++ b/pan/data-impl/data-impl.cc 21 + @@ -22,10 +22,8 @@ 22 + **************/ 23 + 24 + #include <config.h> 25 + -extern "C" { 26 + - #include <glib/gi18n.h> 27 + - #include <glib.h> // for g_build_filename 28 + -} 29 + +#include <glib/gi18n.h> 30 + +#include <glib.h> // for g_build_filename 31 + #include <pan/general/debug.h> 32 + #include <pan/general/file-util.h> 33 + #include <pan/general/log.h> 34 + diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc 35 + index bea1a90..d938634 100644 36 + --- a/pan/data-impl/data-io.cc 37 + +++ b/pan/data-impl/data-io.cc 38 + @@ -27,9 +27,9 @@ extern "C" { 39 + #include <sys/types.h> // for chmod 40 + #include <sys/stat.h> // for chmod 41 + #include <unistd.h> 42 + - #include <glib.h> 43 + - #include <glib/gi18n.h> 44 + } 45 + +#include <glib.h> 46 + +#include <glib/gi18n.h> 47 + #include <pan/general/debug.h> 48 + #include <pan/general/file-util.h> 49 + #include <pan/general/line-reader.h> 50 + diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc 51 + index 244feb9..da0183a 100644 52 + --- a/pan/data-impl/groups.cc 53 + +++ b/pan/data-impl/groups.cc 54 + @@ -29,9 +29,9 @@ 55 + #include <vector> 56 + 57 + #include <glib.h> 58 + +#include <glib/gi18n.h> 59 + extern "C" { 60 + #include <unistd.h> 61 + - #include <glib/gi18n.h> 62 + } 63 + 64 + #include <pan/general/debug.h> 65 + diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc 66 + index f8c4466..16d5672 100644 67 + --- a/pan/data-impl/headers.cc 68 + +++ b/pan/data-impl/headers.cc 69 + @@ -25,10 +25,10 @@ 70 + #include <string> 71 + #include <cmath> 72 + #include <glib.h> 73 + +#include <glib/gi18n.h> 74 + extern "C" { 75 + #include <sys/types.h> // for chmod 76 + #include <sys/stat.h> // for chmod 77 + - #include <glib/gi18n.h> 78 + } 79 + #include <pan/general/debug.h> 80 + #include <pan/general/log.h> 81 + diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc 82 + index e999fda..a6e6bb5 100644 83 + --- a/pan/data-impl/profiles.cc 84 + +++ b/pan/data-impl/profiles.cc 85 + @@ -26,9 +26,9 @@ 86 + extern "C" { 87 + #include <sys/types.h> // for chmod 88 + #include <sys/stat.h> // for chmod 89 + - #include <glib.h> 90 + - #include <glib/gi18n.h> 91 + } 92 + +#include <glib.h> 93 + +#include <glib/gi18n.h> 94 + #include <pan/general/debug.h> 95 + #include <pan/general/string-view.h> 96 + #include <pan/general/file-util.h> 97 + diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc 98 + index 9ea55d4..b23782f 100644 99 + --- a/pan/data-impl/server.cc 100 + +++ b/pan/data-impl/server.cc 101 + @@ -25,10 +25,8 @@ 102 + #include <map> 103 + #include <set> 104 + #include <vector> 105 + -extern "C" { 106 + - #include <glib.h> // for GMarkup 107 + - #include <glib/gi18n.h> 108 + -} 109 + +#include <glib.h> // for GMarkup 110 + +#include <glib/gi18n.h> 111 + #include <pan/general/debug.h> 112 + #include <pan/general/file-util.h> 113 + #include <pan/general/log.h> 114 + diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc 115 + index ff8644f..a199556 100644 116 + --- a/pan/data-impl/xover.cc 117 + +++ b/pan/data-impl/xover.cc 118 + @@ -20,10 +20,8 @@ 119 + #include <config.h> 120 + #include <cmath> 121 + #include <fstream> 122 + -extern "C" { 123 + - #include <glib/gi18n.h> 124 + - #include <gmime/gmime.h> 125 + -} 126 + +#include <glib/gi18n.h> 127 + +#include <gmime/gmime.h> 128 + #include <pan/general/debug.h> 129 + #include <pan/general/log.h> 130 + #include <pan/general/macros.h> 131 + diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc 132 + index 1855153..30fa0f9 100644 133 + --- a/pan/data/article-cache.cc 134 + +++ b/pan/data/article-cache.cc 135 + @@ -26,11 +26,10 @@ extern "C" 136 + #include <sys/stat.h> 137 + #include <unistd.h> 138 + #include <dirent.h> 139 + - 140 + - #include <glib.h> 141 + - #include <glib/gi18n.h> 142 + - #include <gmime/gmime.h> 143 + } 144 + +#include <glib.h> 145 + +#include <gmime/gmime.h> 146 + +#include <glib/gi18n.h> 147 + 148 + #include <pan/general/debug.h> 149 + #include <pan/general/file-util.h> 150 + diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h 151 + index 2ac722b..1304bfe 100644 152 + --- a/pan/data/article-cache.h 153 + +++ b/pan/data/article-cache.h 154 + @@ -22,9 +22,7 @@ 155 + 156 + #include <map> 157 + #include <vector> 158 + -extern "C" { 159 + - #include <glib.h> // for guint64 160 + -} 161 + +#include <glib.h> // for guint64 162 + #include <pan/general/string-view.h> 163 + #include <pan/general/quark.h> 164 + 165 + diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc 166 + index 340fc8b..f6cd46e 100644 167 + --- a/pan/data/cert-store.cc 168 + +++ b/pan/data/cert-store.cc 169 + @@ -34,10 +34,8 @@ 170 + #include <iostream> 171 + #include <string> 172 + 173 + -extern "C" { 174 + #include <glib/gi18n.h> 175 + #include <glib.h> 176 + -} 177 + 178 + #include <pan/general/debug.h> 179 + #include <pan/general/e-util.h> 180 + diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc 181 + index 3a82ea9..61c67a2 100644 182 + --- a/pan/data/encode-cache.cc 183 + +++ b/pan/data/encode-cache.cc 184 + @@ -28,11 +28,10 @@ extern "C" 185 + #include <sys/stat.h> 186 + #include <unistd.h> 187 + #include <dirent.h> 188 + - 189 + - #include <glib.h> 190 + - #include <glib/gi18n.h> 191 + - #include <gmime/gmime.h> 192 + } 193 + +#include <gmime/gmime.h> 194 + +#include <glib.h> 195 + +#include <glib/gi18n.h> 196 + 197 + #include <pan/general/debug.h> 198 + #include <pan/general/file-util.h> 199 + diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h 200 + index 8bbd530..1affc0c 100644 201 + --- a/pan/data/encode-cache.h 202 + +++ b/pan/data/encode-cache.h 203 + @@ -22,9 +22,7 @@ 204 + 205 + #include <map> 206 + #include <vector> 207 + -extern "C" { 208 + - #include <glib.h> // for guint64 209 + -} 210 + +#include <glib.h> // for guint64 211 + #include <pan/general/string-view.h> 212 + #include <pan/general/quark.h> 213 + 214 + diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc 215 + index af5ccd0..62879ee 100644 216 + --- a/pan/general/e-util.cc 217 + +++ b/pan/general/e-util.cc 218 + @@ -26,9 +26,9 @@ 219 + #include <ctime> 220 + extern "C" { 221 + #include <ctype.h> 222 + - #include <glib.h> 223 + - #include <glib/gi18n.h> 224 + } 225 + +#include <glib.h> 226 + +#include <glib/gi18n.h> 227 + #include "debug.h" 228 + #include "e-util.h" 229 + 230 + diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc 231 + index 02e9ed1..9efa269 100644 232 + --- a/pan/general/file-util.cc 233 + +++ b/pan/general/file-util.cc 234 + @@ -27,12 +27,12 @@ extern "C" 235 + #include <unistd.h> 236 + #include <sys/stat.h> 237 + #include <sys/types.h> 238 + - #include <glib.h> 239 + - #include <glib/gi18n.h> 240 + #ifndef G_OS_WIN32 241 + #include <pwd.h> 242 + #endif 243 + } 244 + +#include <glib.h> 245 + +#include <glib/gi18n.h> 246 + 247 + #include "debug.h" 248 + #include "log.h" 249 + diff --git a/pan/general/file-util.h b/pan/general/file-util.h 250 + index c125c8d..8c67639 100644 251 + --- a/pan/general/file-util.h 252 + +++ b/pan/general/file-util.h 253 + @@ -25,9 +25,9 @@ 254 + extern "C" { 255 + #include <stddef.h> 256 + #include <stdio.h> 257 + - #include <glib.h> 258 + - #include <glib/gstdio.h> 259 + } 260 + +#include <glib.h> 261 + +#include <glib/gstdio.h> 262 + #include <pan/general/string-view.h> 263 + 264 + #define g_freopen freopen 265 + diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc 266 + index afb9be8..6b80fc4 100644 267 + --- a/pan/general/line-reader.cc 268 + +++ b/pan/general/line-reader.cc 269 + @@ -1,9 +1,7 @@ 270 + #include <config.h> 271 + #include <cstdio> 272 + #include <cstdlib> 273 + -extern "C"{ 274 + - #include <glib/gi18n.h> 275 + -} 276 + +#include <glib/gi18n.h> 277 + #include <cerrno> 278 + #include "file-util.h" 279 + #include "line-reader.h" 280 + diff --git a/pan/general/macros.h b/pan/general/macros.h 281 + index 6dcf908..b16230f 100644 282 + --- a/pan/general/macros.h 283 + +++ b/pan/general/macros.h 284 + @@ -63,9 +63,6 @@ 285 + *** g_assert 286 + **/ 287 + 288 + -extern "C" 289 + -{ 290 + - #include <glib.h> 291 + -} 292 + +#include <glib.h> 293 + 294 + #endif 295 + diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc 296 + index fcacbe2..d390de0 100644 297 + --- a/pan/general/text-match.cc 298 + +++ b/pan/general/text-match.cc 299 + @@ -20,9 +20,9 @@ 300 + #include <config.h> 301 + extern "C" { 302 + #include <ctype.h> 303 + - #include <glib.h> 304 + - #include <glib/gi18n.h> 305 + } 306 + +#include <glib.h> 307 + +#include <glib/gi18n.h> 308 + #include "debug.h" 309 + #include "log.h" 310 + #include "text-match.h" 311 + diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc 312 + index be79a13..fea6100 100644 313 + --- a/pan/general/utf8-utils.cc 314 + +++ b/pan/general/utf8-utils.cc 315 + @@ -21,9 +21,7 @@ 316 + #include <string> 317 + #include <vector> 318 + #include <string.h> 319 + -extern "C" { 320 + #include <glib/gi18n.h> 321 + -} 322 + #include <locale.h> 323 + #include <gmime/gmime.h> 324 + #include <pan/general/debug.h> 325 + diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc 326 + index 520c08b..5ec397c 100644 327 + --- a/pan/gui/actions.cc 328 + +++ b/pan/gui/actions.cc 329 + @@ -18,11 +18,9 @@ 330 + */ 331 + 332 + #include <config.h> 333 + -extern "C" { 334 + - #include <glib/gi18n.h> 335 + - #include "gtk-compat.h" 336 + -} 337 + +#include "gtk-compat.h" 338 + 339 + +#include <glib/gi18n.h> 340 + #include <pan/general/macros.h> 341 + #include <pan/general/debug.h> 342 + #include <pan/data-impl/data-impl.h> 343 + diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc 344 + index 53e9124..e9841e2 100644 345 + --- a/pan/gui/body-pane.cc 346 + +++ b/pan/gui/body-pane.cc 347 + @@ -22,11 +22,9 @@ 348 + #include <cmath> 349 + #include <iostream> 350 + #include <sstream> 351 + -extern "C" { 352 + - #include <glib/gi18n.h> 353 + - #include "gtk-compat.h" 354 + - #include <gmime/gmime.h> 355 + -} 356 + +#include "gtk-compat.h" 357 + +#include <gmime/gmime.h> 358 + +#include <glib/gi18n.h> 359 + #include <gdk-pixbuf/gdk-pixbuf.h> 360 + #include <pan/general/debug.h> 361 + #include <pan/general/log.h> 362 + diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc 363 + index 5841651..e9f4b2d 100644 364 + --- a/pan/gui/dl-headers-ui.cc 365 + +++ b/pan/gui/dl-headers-ui.cc 366 + @@ -18,11 +18,9 @@ 367 + */ 368 + 369 + #include <config.h> 370 + -extern "C" { 371 + - #include <glib.h> 372 + - #include <glib/gi18n.h> 373 + - #include "gtk-compat.h" 374 + -} 375 + +#include <glib.h> 376 + +#include <glib/gi18n.h> 377 + +#include "gtk-compat.h" 378 + #include <pan/general/macros.h> 379 + #include <pan/tasks/queue.h> 380 + #include <pan/tasks/task-xover.h> 381 + diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc 382 + index 28ad581..3ff103e 100644 383 + --- a/pan/gui/group-pane.cc 384 + +++ b/pan/gui/group-pane.cc 385 + @@ -20,10 +20,8 @@ 386 + #include <config.h> 387 + #include <cassert> 388 + #include <deque> 389 + -extern "C" { 390 + - #include <glib/gi18n.h> 391 + - #include "gtk-compat.h" 392 + -} 393 + +#include "gtk-compat.h" 394 + +#include <glib/gi18n.h> 395 + #include <pan/general/debug.h> 396 + //#include <pan/general/gdk-threads.h> 397 + #include <pan/general/log.h> 398 + diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc 399 + index 677b07a..0d7df8b 100644 400 + --- a/pan/gui/group-prefs-dialog.cc 401 + +++ b/pan/gui/group-prefs-dialog.cc 402 + @@ -18,14 +18,14 @@ 403 + */ 404 + 405 + #include <config.h> 406 + -extern "C" { 407 + - #include <glib/gi18n.h> 408 + - #include <glib.h> 409 + - #include "gtk-compat.h" 410 + +#include <glib/gi18n.h> 411 + +#include <glib.h> 412 + #ifdef HAVE_GTKSPELL 413 + +extern "C" { 414 + #include <enchant/enchant.h> 415 + -#endif 416 + } 417 + +#endif 418 + +#include "gtk-compat.h" 419 + #include <pan/general/debug.h> 420 + #include <pan/general/macros.h> 421 + #include <pan/data/data.h> 422 + diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc 423 + index 3e9851b..b06a949 100644 424 + --- a/pan/gui/group-prefs.cc 425 + +++ b/pan/gui/group-prefs.cc 426 + @@ -21,8 +21,8 @@ extern "C" { 427 + #include <config.h> 428 + #include <sys/types.h> // chmod 429 + #include <sys/stat.h> // chmod 430 + - #include <glib.h> 431 + } 432 + +#include <glib.h> 433 + #include <iostream> 434 + #include <fstream> 435 + #include <pan/general/file-util.h> 436 + diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc 437 + index f79aa1e..9f8787e 100644 438 + --- a/pan/gui/gui.cc 439 + +++ b/pan/gui/gui.cc 440 + @@ -25,9 +25,9 @@ 441 + extern "C" { 442 + #include <sys/types.h> // for chmod 443 + #include <sys/stat.h> // for chmod 444 + - #include <glib/gi18n.h> 445 + #include <dirent.h> 446 + } 447 + +#include <glib/gi18n.h> 448 + #include <pan/general/debug.h> 449 + #include <pan/general/e-util.h> 450 + #include <pan/general/file-util.h> 451 + diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc 452 + index dc65a77..a4a9952 100644 453 + --- a/pan/gui/header-pane.cc 454 + +++ b/pan/gui/header-pane.cc 455 + @@ -19,10 +19,9 @@ 456 + 457 + extern "C" { 458 + #include <config.h> 459 + - #include <glib/gi18n.h> 460 + - #include "gtk-compat.h" 461 + - #include "gtk-compat.h" 462 + } 463 + +#include "gtk-compat.h" 464 + +#include <glib/gi18n.h> 465 + #include <cctype> 466 + #include <cmath> 467 + #include <algorithm> 468 + diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc 469 + index 7b11493..b204298 100644 470 + --- a/pan/gui/log-ui.cc 471 + +++ b/pan/gui/log-ui.cc 472 + @@ -21,10 +21,8 @@ 473 + #include <ostream> 474 + #include <fstream> 475 + #include <iostream> 476 + -extern "C" { 477 + - #include <glib/gi18n.h> 478 + - #include "gtk-compat.h" 479 + -} 480 + +#include "gtk-compat.h" 481 + +#include <glib/gi18n.h> 482 + #include <pan/general/log.h> 483 + #include <pan/general/macros.h> 484 + #include <pan/general/string-view.h> 485 + diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc 486 + index 705fc91..c67acf8 100644 487 + --- a/pan/gui/pan-file-entry.cc 488 + +++ b/pan/gui/pan-file-entry.cc 489 + @@ -19,10 +19,8 @@ 490 + 491 + #include <config.h> 492 + #include <string> 493 + -extern "C" { 494 + - #include <glib/gi18n.h> 495 + - #include "gtk-compat.h" 496 + -} 497 + +#include "gtk-compat.h" 498 + +#include <glib/gi18n.h> 499 + #include <pan/general/file-util.h> 500 + #include "pad.h" 501 + #include "pan-file-entry.h" 502 + diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc 503 + index fb3a696..46c1a5d 100644 504 + --- a/pan/gui/pan.cc 505 + +++ b/pan/gui/pan.cc 506 + @@ -24,9 +24,6 @@ 507 + #include <signal.h> 508 + 509 + extern "C" { 510 + - #include <glib/gi18n.h> 511 + - #include "gtk-compat.h" 512 + - #include <gmime/gmime.h> 513 + #include <gio/gio.h> 514 + #include <sys/types.h> 515 + #include <sys/stat.h> 516 + @@ -34,6 +31,9 @@ extern "C" { 517 + #include <uulib/crc32.h> 518 + } 519 + 520 + +#include "gtk-compat.h" 521 + +#include <glib/gi18n.h> 522 + +#include <gmime/gmime.h> 523 + #ifdef G_OS_WIN32 524 + #undef _WIN32_WINNT 525 + #define _WIN32_WINNT 0x0501 526 + diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc 527 + index 8769ec5..92c757d 100644 528 + --- a/pan/gui/post-ui.cc 529 + +++ b/pan/gui/post-ui.cc 530 + @@ -23,14 +23,14 @@ 531 + #include <sstream> 532 + #include <unistd.h> 533 + extern "C" { 534 + - #include <gmime/gmime.h> 535 + - #include <glib/gi18n.h> 536 + - #include "gtk-compat.h" 537 + #include <sys/time.h> 538 + #ifdef HAVE_GTKSPELL 539 + #include <gtkspell/gtkspell.h> 540 + #endif 541 + } 542 + +#include "gtk-compat.h" 543 + +#include <gmime/gmime.h> 544 + +#include <glib/gi18n.h> 545 + #include <pan/data/data.h> 546 + #include <pan/general/debug.h> 547 + #include <pan/general/file-util.h> 548 + diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc 549 + index bde7ef3..64c540f 100644 550 + --- a/pan/gui/prefs-file.cc 551 + +++ b/pan/gui/prefs-file.cc 552 + @@ -24,8 +24,8 @@ 553 + extern "C" { 554 + #include <sys/types.h> // for chmod 555 + #include <sys/stat.h> // for chmod 556 + - #include <glib.h> 557 + } 558 + +#include <glib.h> 559 + #include <pan/general/file-util.h> 560 + #include "prefs-file.h" 561 + 562 + diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc 563 + index f7dc0f0..aac9ec1 100644 564 + --- a/pan/gui/prefs-ui.cc 565 + +++ b/pan/gui/prefs-ui.cc 566 + @@ -18,10 +18,8 @@ 567 + */ 568 + 569 + #include <config.h> 570 + -extern "C" { 571 + - #include <glib/gi18n.h> 572 + - #include "gtk-compat.h" 573 + -} 574 + +#include "gtk-compat.h" 575 + +#include <glib/gi18n.h> 576 + #include <pan/general/debug.h> 577 + #include <pan/general/macros.h> 578 + #include <pan/general/file-util.h> 579 + diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc 580 + index fdbd908..64dd8da 100644 581 + --- a/pan/gui/prefs.cc 582 + +++ b/pan/gui/prefs.cc 583 + @@ -23,10 +23,8 @@ 584 + #include <iostream> 585 + #include <sstream> 586 + #include <string> 587 + -extern "C" { 588 + - #include <glib.h> 589 + - #include <glib/gi18n.h> 590 + -} 591 + +#include <glib.h> 592 + +#include <glib/gi18n.h> 593 + #include <pan/general/debug.h> 594 + #include <pan/general/log.h> 595 + #include <pan/general/macros.h> 596 + diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc 597 + index 26ff029..cf8bd44 100644 598 + --- a/pan/gui/profiles-dialog.cc 599 + +++ b/pan/gui/profiles-dialog.cc 600 + @@ -23,10 +23,8 @@ 601 + 602 + #include <config.h> 603 + #include <iostream> 604 + -extern "C" { 605 + - #include <glib/gi18n.h> 606 + - #include "gtk-compat.h" 607 + -} 608 + +#include "gtk-compat.h" 609 + +#include <glib/gi18n.h> 610 + #include <pan/general/debug.h> 611 + #include <pan/general/macros.h> 612 + #include <pan/usenet-utils/gnksa.h> 613 + diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc 614 + index 241ad1c..43ef4f2 100644 615 + --- a/pan/gui/progress-view.cc 616 + +++ b/pan/gui/progress-view.cc 617 + @@ -18,9 +18,7 @@ 618 + */ 619 + 620 + #include <config.h> 621 + -extern "C" { 622 + - #include "gtk-compat.h" 623 + -} 624 + +#include "gtk-compat.h" 625 + #include <pan/general/string-view.h> 626 + #include <pan/usenet-utils/mime-utils.h> 627 + #include "progress-view.h" 628 + diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc 629 + index 0b08b6f..0e86a1b 100644 630 + --- a/pan/gui/save-attach-ui.cc 631 + +++ b/pan/gui/save-attach-ui.cc 632 + @@ -18,10 +18,8 @@ 633 + */ 634 + 635 + #include <config.h> 636 + -extern "C" { 637 + - #include <glib/gi18n.h> 638 + - #include "gtk-compat.h" 639 + -} 640 + +#include "gtk-compat.h" 641 + +#include <glib/gi18n.h> 642 + #include <pan/general/debug.h> 643 + #include <pan/general/macros.h> 644 + #include <pan/icons/pan-pixbufs.h> 645 + diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc 646 + index 0f034e5..1df0cfb 100644 647 + --- a/pan/gui/save-ui.cc 648 + +++ b/pan/gui/save-ui.cc 649 + @@ -18,10 +18,8 @@ 650 + */ 651 + 652 + #include <config.h> 653 + -extern "C" { 654 + - #include <glib/gi18n.h> 655 + - #include "gtk-compat.h" 656 + -} 657 + +#include "gtk-compat.h" 658 + +#include <glib/gi18n.h> 659 + #include <pan/general/debug.h> 660 + #include <pan/general/macros.h> 661 + #include <pan/icons/pan-pixbufs.h> 662 + diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc 663 + index e72bdb5..3b81167 100644 664 + --- a/pan/gui/score-add-ui.cc 665 + +++ b/pan/gui/score-add-ui.cc 666 + @@ -20,9 +20,7 @@ 667 + #include <config.h> 668 + #include <cassert> 669 + #include <climits> 670 + -extern "C" { 671 + - #include <glib/gi18n.h> 672 + -} 673 + +#include <glib/gi18n.h> 674 + #include <pan/general/debug.h> 675 + #include <pan/general/text-match.h> 676 + #include "hig.h" 677 + diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc 678 + index d6c81c1..1327426 100644 679 + --- a/pan/gui/score-view-ui.cc 680 + +++ b/pan/gui/score-view-ui.cc 681 + @@ -18,10 +18,8 @@ 682 + */ 683 + 684 + #include <config.h> 685 + -extern "C" { 686 + - #include <glib/gi18n.h> 687 + - #include "gtk-compat.h" 688 + -} 689 + +#include "gtk-compat.h" 690 + +#include <glib/gi18n.h> 691 + #include <pan/general/debug.h> 692 + #include "pad.h" 693 + #include "score-add-ui.h" 694 + diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc 695 + index b42bc18..268114b 100644 696 + --- a/pan/gui/server-ui.cc 697 + +++ b/pan/gui/server-ui.cc 698 + @@ -21,11 +21,9 @@ 699 + #include <cstdlib> 700 + #include <cstring> 701 + #include <climits> 702 + -extern "C" { 703 + - #include <glib.h> 704 + - #include <glib/gi18n.h> 705 + - #include "gtk-compat.h" 706 + -} 707 + +#include <glib.h> 708 + +#include <glib/gi18n.h> 709 + +#include "gtk-compat.h" 710 + 711 + #include <pan/icons/pan-pixbufs.h> 712 + #include <pan/general/file-util.h> 713 + diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc 714 + index 4f77922..18a8f74 100644 715 + --- a/pan/gui/task-pane.cc 716 + +++ b/pan/gui/task-pane.cc 717 + @@ -18,11 +18,9 @@ 718 + */ 719 + 720 + #include <config.h> 721 + -extern "C" { 722 + - #include <glib.h> 723 + - #include <glib/gi18n.h> 724 + - #include "gtk-compat.h" 725 + -} 726 + +#include <glib.h> 727 + +#include <glib/gi18n.h> 728 + +#include "gtk-compat.h" 729 + #include <pan/general/e-util.h> 730 + #include <pan/general/debug.h> 731 + #include <pan/general/file-util.h> 732 + diff --git a/pan/gui/url.cc b/pan/gui/url.cc 733 + index e1173ae..94ffb52 100644 734 + --- a/pan/gui/url.cc 735 + +++ b/pan/gui/url.cc 736 + @@ -20,10 +20,8 @@ 737 + #include <config.h> 738 + #include <iostream> 739 + #include <string> 740 + -extern "C" { 741 + - #include <glib.h> 742 + - #include <glib/gi18n.h> 743 + -}; 744 + +#include <glib.h> 745 + +#include <glib/gi18n.h> 746 + #include <pan/general/log.h> 747 + #include "url.h" 748 + 749 + diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc 750 + index b4c21ae..f8cb6db 100644 751 + --- a/pan/tasks/decoder.cc 752 + +++ b/pan/tasks/decoder.cc 753 + @@ -28,8 +28,8 @@ 754 + extern "C" { 755 + # define PROTOTYPES 756 + # include <uulib/uudeview.h> 757 + -# include <glib/gi18n.h> 758 + }; 759 + +#include <glib/gi18n.h> 760 + #include <pan/general/worker-pool.h> 761 + #include <pan/general/debug.h> 762 + #include <pan/general/file-util.h> 763 + diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc 764 + index 7960b84..5989059 100644 765 + --- a/pan/tasks/encoder.cc 766 + +++ b/pan/tasks/encoder.cc 767 + @@ -31,10 +31,10 @@ 768 + extern "C" { 769 + #define PROTOTYPES 770 + #include <uulib/uudeview.h> 771 + -#include <glib/gi18n.h> 772 + #include <sys/time.h> 773 + }; 774 + 775 + +#include <glib/gi18n.h> 776 + #include <pan/general/worker-pool.h> 777 + #include <pan/general/debug.h> 778 + #include <pan/general/file-util.h> 779 + diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc 780 + index ceb1574..71c5cf1 100644 781 + --- a/pan/tasks/nntp.cc 782 + +++ b/pan/tasks/nntp.cc 783 + @@ -22,10 +22,8 @@ 784 + #include <cstdarg> 785 + #include <cstdlib> // abort, atoi, strtoul 786 + #include <cstdio> // snprintf 787 + -extern "C" { 788 + - #include <glib.h> 789 + - #include <glib/gi18n.h> 790 + -} 791 + +#include <glib.h> 792 + +#include <glib/gi18n.h> 793 + #include <pan/general/debug.h> 794 + #include <pan/general/log.h> 795 + #include <pan/general/messages.h> 796 + diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc 797 + index af890e5..14df6f6 100644 798 + --- a/pan/tasks/nzb.cc 799 + +++ b/pan/tasks/nzb.cc 800 + @@ -24,9 +24,7 @@ 801 + #include <sstream> 802 + #include <string> 803 + #include <map> 804 + -extern "C" { 805 + - #include <glib.h> 806 + -} 807 + +#include <glib.h> 808 + #include <pan/general/debug.h> 809 + #include <pan/general/file-util.h> 810 + #include <pan/general/log.h> 811 + diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc 812 + index d3339dd..7dc2ec1 100644 813 + --- a/pan/tasks/socket-impl-gio.cc 814 + +++ b/pan/tasks/socket-impl-gio.cc 815 + @@ -31,9 +31,9 @@ 816 + 817 + extern "C" { 818 + #include <unistd.h> 819 + - #include <glib/gi18n.h> 820 + } 821 + 822 + +#include <glib/gi18n.h> 823 + #include <pan/general/file-util.h> 824 + #include <pan/general/log.h> 825 + #include <pan/general/macros.h> 826 + diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc 827 + index c33edfd..688183c 100644 828 + --- a/pan/tasks/socket-impl-main.cc 829 + +++ b/pan/tasks/socket-impl-main.cc 830 + @@ -30,10 +30,7 @@ 831 + //#include <glib/giochannel.h> 832 + //#include <glib/gstring.h> 833 + 834 + -extern "C" 835 + -{ 836 + - #include <glib.h> 837 + -} 838 + +#include <glib.h> 839 + 840 + #include <pan/tasks/socket.h> 841 + 842 + diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc 843 + index b58e074..5b1b0b0 100644 844 + --- a/pan/tasks/socket-impl-openssl.cc 845 + +++ b/pan/tasks/socket-impl-openssl.cc 846 + @@ -34,13 +34,14 @@ 847 + 848 + extern "C" { 849 + #include <unistd.h> 850 + - #include <glib/gi18n.h> 851 + #include <errno.h> 852 + #include <fcntl.h> 853 + #include <sys/time.h> 854 + #include <sys/types.h> 855 + } 856 + 857 + +#include <glib/gi18n.h> 858 + + 859 + #include <pan/usenet-utils/ssl-utils.h> 860 + #include <pan/general/file-util.h> 861 + #include <pan/general/log.h> 862 + diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h 863 + index e48cbae..eea41d4 100644 864 + --- a/pan/tasks/socket-impl-openssl.h 865 + +++ b/pan/tasks/socket-impl-openssl.h 866 + @@ -27,10 +27,7 @@ 867 + #include <string> 868 + //#include <glib/giochannel.h> 869 + //#include <glib/gstring.h> 870 + -extern "C" 871 + -{ 872 + - #include <glib.h> 873 + -} 874 + +#include <glib.h> 875 + 876 + #include <pan/general/debug.h> 877 + #include <pan/general/quark.h> 878 + diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc 879 + index 78d53fb..2c7a28d 100644 880 + --- a/pan/tasks/socket.cc 881 + +++ b/pan/tasks/socket.cc 882 + @@ -21,9 +21,7 @@ 883 + #include <cstdarg> 884 + #include <ctime> 885 + #include <cmath> 886 + -extern "C" { 887 + - #include <glib.h> 888 + -} 889 + +#include <glib.h> 890 + #include <pan/general/debug.h> 891 + #include <pan/general/string-view.h> 892 + #include "socket.h" 893 + diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc 894 + index 9c96b7d..1dc17ba 100644 895 + --- a/pan/tasks/task-article.cc 896 + +++ b/pan/tasks/task-article.cc 897 + @@ -24,10 +24,7 @@ 898 + #include <config.h> 899 + #include <algorithm> 900 + #include <cassert> 901 + -extern "C" 902 + -{ 903 + - #include <glib/gi18n.h> 904 + -} 905 + +#include <glib/gi18n.h> 906 + #include <pan/general/debug.h> 907 + #include <pan/general/file-util.h> 908 + #include <pan/general/utf8-utils.h> 909 + diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc 910 + index b8618d6..9b72369 100644 911 + --- a/pan/tasks/task-groups.cc 912 + +++ b/pan/tasks/task-groups.cc 913 + @@ -20,9 +20,9 @@ 914 + #include <config.h> 915 + #include <cassert> 916 + extern "C" { 917 + - #include <glib/gi18n.h> 918 + #include <stdlib.h> 919 + } 920 + +#include <glib/gi18n.h> 921 + #include <pan/general/debug.h> 922 + #include <pan/general/macros.h> 923 + #include <pan/general/messages.h> 924 + diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc 925 + index bb80fb9..4ab9c2f 100644 926 + --- a/pan/tasks/task-post.cc 927 + +++ b/pan/tasks/task-post.cc 928 + @@ -18,9 +18,7 @@ 929 + */ 930 + 931 + #include <config.h> 932 + -extern "C" { 933 + - #include <glib/gi18n.h> 934 + -} 935 + +#include <glib/gi18n.h> 936 + #include "task-post.h" 937 + #include <pan/general/debug.h> 938 + #include <pan/general/log.h> 939 + diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h 940 + index 7bd4fe0..e5377c6 100644 941 + --- a/pan/tasks/task-upload.h 942 + +++ b/pan/tasks/task-upload.h 943 + @@ -37,10 +37,10 @@ 944 + extern "C" { 945 + #define PROTOTYPES 946 + #include <uulib/uudeview.h> 947 + - #include <gmime/gmime.h> 948 + - #include <glib/gi18n.h> 949 + }; 950 + 951 + +#include <gmime/gmime.h> 952 + +#include <glib/gi18n.h> 953 + #include <set> 954 + 955 + namespace pan 956 + diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc 957 + index c3c8260..64b41a4 100644 958 + --- a/pan/tasks/task-xover.cc 959 + +++ b/pan/tasks/task-xover.cc 960 + @@ -26,10 +26,10 @@ extern "C" 961 + #define PROTOTYPES 962 + #include <stdio.h> 963 + #include <uulib/uudeview.h> 964 + -#include <glib/gi18n.h> 965 + -#include <gmime/gmime-utils.h> 966 + } 967 + 968 + +#include <gmime/gmime-utils.h> 969 + +#include <glib/gi18n.h> 970 + #include <fstream> 971 + #include <iostream> 972 + #include <pan/general/debug.h> 973 + diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc 974 + index c598bf8..9a9e488 100644 975 + --- a/pan/tasks/task-xoverinfo.cc 976 + +++ b/pan/tasks/task-xoverinfo.cc 977 + @@ -24,10 +24,10 @@ extern "C" { 978 + #define PROTOTYPES 979 + #include <stdio.h> 980 + #include <uulib/uudeview.h> 981 + - #include <glib/gi18n.h> 982 + - #include <gmime/gmime-utils.h> 983 + #include <zlib.h> 984 + } 985 + +#include <glib/gi18n.h> 986 + +#include <gmime/gmime-utils.h> 987 + #include <fstream> 988 + #include <iostream> 989 + #include <pan/general/debug.h> 990 + diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc 991 + index f464428..6b1a5c9 100644 992 + --- a/pan/usenet-utils/filter-info.cc 993 + +++ b/pan/usenet-utils/filter-info.cc 994 + @@ -18,10 +18,8 @@ 995 + */ 996 + 997 + #include <config.h> 998 + -extern "C" { 999 + - #include <glib.h> 1000 + - #include <glib/gi18n.h> 1001 + -} 1002 + +#include <glib.h> 1003 + +#include <glib/gi18n.h> 1004 + #include <pan/general/macros.h> 1005 + #include "filter-info.h" 1006 + 1007 + diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc 1008 + index db1f2c4..fb888d5 100644 1009 + --- a/pan/usenet-utils/gnksa.cc 1010 + +++ b/pan/usenet-utils/gnksa.cc 1011 + @@ -37,10 +37,10 @@ extern "C" 1012 + { 1013 + #include <ctype.h> 1014 + #include <unistd.h> 1015 + - #include <glib/gi18n.h> 1016 + #include <sys/time.h> 1017 + } 1018 + 1019 + +#include <glib/gi18n.h> 1020 + #include <pan/general/debug.h> 1021 + #include <pan/general/macros.h> 1022 + #include <pan/general/log.h> 1023 + diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc 1024 + index 4df4525..8755777 100644 1025 + --- a/pan/usenet-utils/gpg.cc 1026 + +++ b/pan/usenet-utils/gpg.cc 1027 + @@ -28,9 +28,9 @@ extern "C" { 1028 + #include <stdlib.h> 1029 + #include <unistd.h> 1030 + #include <string.h> 1031 + - #include <glib/gi18n.h> 1032 + - #include <gmime/gmime.h> 1033 + } 1034 + +#include <glib/gi18n.h> 1035 + +#include <gmime/gmime.h> 1036 + 1037 + #ifdef HAVE_GMIME_CRYPTO 1038 + 1039 + diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc 1040 + index a511556..461ce86 100644 1041 + --- a/pan/usenet-utils/message-check.cc 1042 + +++ b/pan/usenet-utils/message-check.cc 1043 + @@ -21,9 +21,7 @@ 1044 + #include <ctype.h> 1045 + #include <string.h> 1046 + #include <glib.h> 1047 + -extern "C" { 1048 + #include <glib/gi18n.h> 1049 + -} 1050 + #include <pan/general/debug.h> 1051 + #include <pan/general/macros.h> 1052 + #include <pan/general/string-view.h> 1053 + diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc 1054 + index 1c03adc..91e78be 100644 1055 + --- a/pan/usenet-utils/rules-info.cc 1056 + +++ b/pan/usenet-utils/rules-info.cc 1057 + @@ -22,10 +22,8 @@ 1058 + 1059 + 1060 + #include <config.h> 1061 + -extern "C" { 1062 + - #include <glib.h> 1063 + - #include <glib/gi18n.h> 1064 + -} 1065 + +#include <glib.h> 1066 + +#include <glib/gi18n.h> 1067 + #include <pan/general/macros.h> 1068 + #include "rules-info.h" 1069 + 1070 + diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc 1071 + index 8b56a2a..4b151f0 100644 1072 + --- a/pan/usenet-utils/scorefile.cc 1073 + +++ b/pan/usenet-utils/scorefile.cc 1074 + @@ -23,9 +23,7 @@ 1075 + #include <iostream> 1076 + #include <sstream> 1077 + #include <string> 1078 + -extern "C" { 1079 + - #include <glib/gi18n.h> 1080 + -} 1081 + +#include <glib/gi18n.h> 1082 + #include <pan/general/debug.h> 1083 + #include <pan/general/log.h> 1084 + #include <pan/general/macros.h> 1085 + diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h 1086 + index 2286250..0beb32f 100644 1087 + --- a/pan/usenet-utils/ssl-utils.h 1088 + +++ b/pan/usenet-utils/ssl-utils.h 1089 + @@ -43,9 +43,7 @@ 1090 + #include <map> 1091 + #include <sstream> 1092 + #include <iostream> 1093 + -extern "C" { 1094 + - #include <glib/gi18n.h> 1095 + -} 1096 + +#include <glib/gi18n.h> 1097 + 1098 + namespace pan 1099 + { 1100 + diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc 1101 + index 4fcd8d5..15a818b 100644 1102 + --- a/pan/usenet-utils/text-massager.cc 1103 + +++ b/pan/usenet-utils/text-massager.cc 1104 + @@ -22,9 +22,7 @@ 1105 + #include <map> 1106 + #include <cstring> 1107 + #include <glib.h> 1108 + -extern "C" { 1109 + #include <glib/gi18n.h> 1110 + -} 1111 + #include "text-massager.h" 1112 + #include <pan/general/log.h> 1113 + #include <pan/general/e-util.h>