From ebfc25abe8c6d9503ef89d7374efb8639f3d4173 Mon Sep 17 00:00:00 2001 From: ketmar Date: Sat, 14 Sep 2013 07:56:39 +0300 Subject: [PATCH] guard cosmetix in headers --- src/icons.h | 4 ++-- src/jam.h | 6 ++---- src/jam_xml.h | 7 ++----- src/jamdoc.h | 7 ++----- src/jamview.h | 7 ++----- src/journalstore.h | 7 ++----- src/login.h | 7 ++----- src/marshalers.h | 5 ++--- src/menu.h | 7 ++----- src/music.h | 7 ++----- src/network-internal.h | 7 ++----- src/network.h | 2 -- src/pollcreator.h | 7 ++----- src/preview.h | 7 ++----- src/progress.h | 2 -- src/remote.h | 7 ++----- src/security.h | 7 ++----- src/settings.h | 2 -- src/smartquotes.h | 7 ++----- src/spawn.h | 7 ++----- src/sync.h | 7 ++----- src/thanks.h | 32 -------------------------------- src/throbber.h | 7 ++----- src/tie.h | 7 ++----- src/tools.h | 7 ++----- src/undo.h | 4 ++-- src/usejournal.h | 7 ++----- src/userlabel.h | 7 ++----- src/util-gtk.h | 6 ++---- src/util.h | 7 ++----- 30 files changed, 52 insertions(+), 158 deletions(-) diff --git a/src/icons.h b/src/icons.h index bce0187..992831c 100644 --- a/src/icons.h +++ b/src/icons.h @@ -1,8 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin */ -#ifndef __LOGJAM_ICONS_H_ -#define __LOGJAM_ICONS_H_ +#ifndef __LOGJAM_ICONS_H__ +#define __LOGJAM_ICONS_H__ extern void icons_initialize (void); diff --git a/src/jam.h b/src/jam.h index c5eda7c..afdd4a4 100644 --- a/src/jam.h +++ b/src/jam.h @@ -1,11 +1,9 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ -#ifndef jam_h -#define jam_h +#ifndef __LOGJAM_JAM_H__ +#define __LOGJAM_JAM_H__ #include "liblj/livejournal.h" diff --git a/src/jam_xml.h b/src/jam_xml.h index 7ae1d1b..970b710 100644 --- a/src/jam_xml.h +++ b/src/jam_xml.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __xml_h__ -#define __xml_h__ +#ifndef __LOGJAM_XML_H__ +#define __LOGJAM_XML_H__ #include diff --git a/src/jamdoc.h b/src/jamdoc.h index c8c9f19..e171457 100644 --- a/src/jamdoc.h +++ b/src/jamdoc.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __jam_doc_h__ -#define __jam_doc_h__ +#ifndef __LOGJAM_JAMDOC_H__ +#define __LOGJAM_JAMDOC_H__ #include "liblj/livejournal.h" #include "account.h" diff --git a/src/jamview.h b/src/jamview.h index 2c3b894..f73c4d5 100644 --- a/src/jamview.h +++ b/src/jamview.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef _jam_view_ -#define _jam_view_ +#ifndef __LOGJAM_JAM_VIEW_H__ +#define __LOGJAM_JAM_VIEW_H__ #include "gtk-all.h" #include "jamdoc.h" diff --git a/src/journalstore.h b/src/journalstore.h index e5e85f9..43bf6e2 100644 --- a/src/journalstore.h +++ b/src/journalstore.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef JOURNALSTORE_H -#define JOURNALSTORE_H +#ifndef __LOGJAM_JOURNALSTORE_H__ +#define __LOGJAM_JOURNALSTORE_H__ #include "liblj/livejournal.h" diff --git a/src/login.h b/src/login.h index 7e7eab1..7f9081a 100644 --- a/src/login.h +++ b/src/login.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef login_h -#define login_h +#ifndef __LOGJAM_LOGIN_H__ +#define __LOGJAM_LOGIN_H__ #include "account.h" diff --git a/src/marshalers.h b/src/marshalers.h index 18b06ee..0e17d65 100644 --- a/src/marshalers.h +++ b/src/marshalers.h @@ -1,6 +1,5 @@ - -#ifndef __logjam_marshal_MARSHAL_H__ -#define __logjam_marshal_MARSHAL_H__ +#ifndef __LOGJAM_MARSHALERS_H__ +#define __LOGJAM_MARSHALERS_H__ #include diff --git a/src/menu.h b/src/menu.h index 16318c0..40be8eb 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef menu_h -#define menu_h +#ifndef __LOGJAM_MENU_H__ +#define __LOGJAM_MENU_H__ #include "jam.h" diff --git a/src/music.h b/src/music.h index 396ed2f..cada8ce 100644 --- a/src/music.h +++ b/src/music.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef music_h -#define music_h +#ifndef __LOGJAM_MUSIC_H__ +#define __LOGJAM_MUSIC_H__ #include "conf.h" /* CommandList */ diff --git a/src/network-internal.h b/src/network-internal.h index 1e803ef..cf67fc0 100644 --- a/src/network-internal.h +++ b/src/network-internal.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef network_internal_h -#define network_internal_h +#ifndef __LOGJAM_NETWORK_INTERNAL_H__ +#define __LOGJAM_NETWORK_INTERNAL_H__ #include "network.h" diff --git a/src/network.h b/src/network.h index ab53366..55a05b7 100644 --- a/src/network.h +++ b/src/network.h @@ -1,7 +1,5 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2004 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ #ifndef __LOGJAM_NETWORK_H__ diff --git a/src/pollcreator.h b/src/pollcreator.h index 6268105..2c344d6 100644 --- a/src/pollcreator.h +++ b/src/pollcreator.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef _pollcreator_h_ -#define _pollcreator_h_ +#ifndef __LOGJAM_POLLCREATOR_H__ +#define __LOGJAM_POLLCREATOR_H__ void run_poll_creator_dlg(JamWin *jw); diff --git a/src/preview.h b/src/preview.h index 560f6bf..4aa97ef 100644 --- a/src/preview.h +++ b/src/preview.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2005 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __html_preview_h__ -#define __html_preview_h__ +#ifndef __LOGJAM_PREVIEW_H__ +#define __LOGJAM_PREVIEW_H__ #include #include "liblj/livejournal.h" diff --git a/src/progress.h b/src/progress.h index aecab67..f750b4a 100644 --- a/src/progress.h +++ b/src/progress.h @@ -1,7 +1,5 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2005 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ #ifndef __LOGJAM_PROGRESS_H__ diff --git a/src/remote.h b/src/remote.h index ddb80ff..3636f59 100644 --- a/src/remote.h +++ b/src/remote.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef remote_h -#define remote_h +#ifndef __LOGJAM_REMOTE_H__ +#define __LOGJAM_REMOTE_H__ GQuark remote_error_quark(void); #define REMOTE_ERROR remote_error_quark() diff --git a/src/security.h b/src/security.h index 05d255d..0e97216 100644 --- a/src/security.h +++ b/src/security.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __SECURITY_H__ -#define __SECURITY_H__ +#ifndef __LOGJAM_SECURITY_H__ +#define __LOGJAM_SECURITY_H__ #include diff --git a/src/settings.h b/src/settings.h index d2d6af2..975dd0a 100644 --- a/src/settings.h +++ b/src/settings.h @@ -1,7 +1,5 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2004 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ #ifndef __LOGJAM_SETTINGS_H__ diff --git a/src/smartquotes.h b/src/smartquotes.h index 2b47c4f..3c8c68b 100644 --- a/src/smartquotes.h +++ b/src/smartquotes.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __smartquotes_h__ -#define __smartquotes_h__ +#ifndef __LOGJAM_SMARTQUOTES_H__ +#define __LOGJAM_SMARTQUOTES_H__ void smartquotes_attach(GtkTextBuffer *buffer, gboolean russian_mode); void smartquotes_detach(GtkTextBuffer *buffer); diff --git a/src/spawn.h b/src/spawn.h index eec0cbf..d25918d 100644 --- a/src/spawn.h +++ b/src/spawn.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __spawn_h__ -#define __spawn_h__ +#ifndef __LOGJAM_SPAWN_H__ +#define __LOGJAM_SPAWN_H__ #include #include "conf.h" /* CommandList */ diff --git a/src/sync.h b/src/sync.h index ca75f47..6c51862 100644 --- a/src/sync.h +++ b/src/sync.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef SYNC_H -#define SYNC_H +#ifndef __LOGJAM_SYNC_H__ +#define __LOGJAM_SYNC_H__ gboolean sync_run(JamAccountLJ *acc, gpointer parent); diff --git a/src/thanks.h b/src/thanks.h index d691b31..25f1c2f 100644 --- a/src/thanks.h +++ b/src/thanks.h @@ -1,4 +1,3 @@ -/* autogenerated by thanks.pl. */ typedef struct { char *name; char *username; @@ -7,67 +6,36 @@ typedef struct { } Contributor; Contributor contribs[] = { - /* this translation is not crucial */ { "Aleksander Adamowski", "", "aleksander.adamowski@gmail.com", N_("patches") }, - /* this translation is not crucial */ { "Satoru SATOH", "", "ss@gnome.gr.jp", N_("Japanese translation") }, - /* this translation is not crucial */ { "Grigory Bakunov", "", "black@asplinux.ru", N_("Russian translation") }, - /* this translation is not crucial */ { "Frank Hofmann", "", "frankhofmann@gmx.ch", N_("German translation") }, - /* this translation is not crucial */ { "George Mason", "", "georgemason@mindspring.com", N_("accelerator saving") }, - /* this translation is not crucial */ { "Dave Spadea", "", "dave@spadea.net", N_("lj-cut patch") }, - /* this translation is not crucial */ { "Dmitry Dyomin", "old_one", "old@old.com.ua", N_("Ukrainian translation") }, - /* this translation is not crucial */ { "Ricardo Mones Lastra", "mones", "ricardo.mones@hispalinux.es", N_("Spanish translation") }, - /* this translation is not crucial */ { "Jon Nall", "", "nall@gentoo.org", N_("Gentoo packaging") }, - /* this translation is not crucial */ { "Mikhail Chekanov", "", "mihun@bitex.com", N_("Russian translation") }, - /* this translation is not crucial */ { "Asaf Bartov", "ijon", "ijon@forum2.org", N_("win32 multithread support") }, - /* this translation is not crucial */ { "Gaal Yahas", "gaal", "gaal@forum2.org", N_("checkfriends, poll creator, i18n") }, - /* this translation is not crucial */ { "Sergei Barbarash", "sgt", "sgt@fep.ru", N_("support for cyrillic translation") }, - /* this translation is not crucial */ { "Michael Bravo", "", "mbravo@tag-ltd.spb.ru", N_("locale fixes") }, - /* this translation is not crucial */ { "Ari Pollak", "", "ari@debian.org", N_("Debian package, undo") }, - /* this translation is not crucial */ { "Steve Bernacki, Jr.", "", "steve@copacetic.net", N_("typo in configure.in") }, - /* this translation is not crucial */ { "Artem Baguinski", "", "artm@v2.nl", N_("locale setting") }, - /* this translation is not crucial */ { "nulld", "", "nulld@encryptedemail.net", N_("OpenBSD box to test on") }, - /* this translation is not crucial */ { "Decklin Foster", "decklin", "decklin@red-bean.com", N_("window geometry save/restore") }, - /* this translation is not crucial */ { "Matthew Vernon", "", "matthew@pick.ucam.org", N_("simple login proxy patch") }, - /* this translation is not crucial */ { "Bill Crawford", "", "bill@eb0ne.net", N_("variety of patches") }, - /* this translation is not crucial */ { "Gabriel Martinez", "diamondc", "gabrielfm@yahoo.com", N_("Solaris box to test on") }, - /* this translation is not crucial */ { "Tom Callaway", "spot", "spot@redhat.com", N_("Advanced RPM packaging") }, - /* this translation is not crucial */ { "Alexander Gräfe", "", "nachtfalke@retrogra.de", N_("Initial RPM packaging") }, - /* this translation is not crucial */ { "Christian Surchi", "christian", "csurchi@debian.org", N_("Debian maintainer") }, - /* this translation is not crucial */ { "Joe Wreschnig", "piman", "piman@sacredchao.net", N_("Debian package help") }, - /* this translation is not crucial */ { "Ryan Younce", "", "ryan@manunkind.org", N_("FreeBSD packaging") }, - /* this translation is not crucial */ { "Raja Mukerji", "", "mukerji@pobox.com", N_("a multitude of patches") }, - /* this translation is not crucial */ { "Adam Bidema", "", "hijinx@klone.nwraves.net", N_("initial file save patch") }, - /* this translation is not crucial */ { "Matt Roper", "", "mdroper@ucdavis.edu", N_("parallel make tips") }, - /* this translation is not crucial */ { "Brad Fitzpatrick", "", "brad@danga.com", N_("much of the original client") }, }; diff --git a/src/throbber.h b/src/throbber.h index 52901cf..e3d3256 100644 --- a/src/throbber.h +++ b/src/throbber.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __throbber_h__ -#define __throbber_h__ +#ifndef __LOGJAM_THROBBER_H__ +#define __LOGJAM_THROBBER_H__ #define THROBBER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), throbber_get_type(), Throbber)) typedef struct _Throbber Throbber; diff --git a/src/tie.h b/src/tie.h index 14f3cf2..d1bb74a 100644 --- a/src/tie.h +++ b/src/tie.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef _TIE_H_ -#define _TIE_H_ +#ifndef __LOGJAM_TIE_H__ +#define __LOGJAM_TIE_H__ GtkWidget* tie_toggle(GtkToggleButton *toggle, gboolean *data); void tie_text (GtkEntry *entry, char **data); diff --git a/src/tools.h b/src/tools.h index 5022c5c..f52c2e3 100644 --- a/src/tools.h +++ b/src/tools.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef tools_h -#define tools_h +#ifndef __LOGJAM_TOOLS_H__ +#define __LOGJAM_TOOLS_H__ #include "jamdoc.h" diff --git a/src/undo.h b/src/undo.h index 1346a22..3df226a 100644 --- a/src/undo.h +++ b/src/undo.h @@ -8,8 +8,8 @@ * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi */ -#ifndef __UNDOMGR_H__ -#define __UNDOMGR_H__ +#ifndef __LOGJAM_UNDOMGR_H__ +#define __LOGJAM_UNDOMGR_H__ #define TYPE_UNDOMGR (undomgr_get_type ()) #define UNDOMGR(obj) (GTK_CHECK_CAST ((obj), TYPE_UNDOMGR, UndoMgr)) diff --git a/src/usejournal.h b/src/usejournal.h index 874a86e..58c0ca4 100644 --- a/src/usejournal.h +++ b/src/usejournal.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2004 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __USEJOURNAL_H__ -#define __USEJOURNAL_H__ +#ifndef __LOGJAM_USEJOURNAL_H__ +#define __LOGJAM_USEJOURNAL_H__ GtkWidget* usejournal_build_menu(const char *defaultjournal, const char *currentjournal, GSList *journals, gpointer doc); diff --git a/src/userlabel.h b/src/userlabel.h index c50d31e..f8b20c5 100644 --- a/src/userlabel.h +++ b/src/userlabel.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2003 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __JAM_USERLABEL_H__ -#define __JAM_USERLABEL_H__ +#ifndef __LOGJAM_USERLABEL_H__ +#define __LOGJAM_USERLABEL_H__ #define JAM_USER_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), jam_user_label_get_type(), JamUserLabel)) typedef struct _JamUserLabel JamUserLabel; diff --git a/src/util-gtk.h b/src/util-gtk.h index 1e13af5..095bc56 100644 --- a/src/util-gtk.h +++ b/src/util-gtk.h @@ -1,10 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2005 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ -#ifndef __logjam_util_gtk_h__ -#define __logjam_util_gtk_h__ +#ifndef __LOGJAM_UTIL_GTK_H__ +#define __LOGJAM_UTIL_GTK_H__ #ifdef HAVE_GTK #include "gtk-all.h" diff --git a/src/util.h b/src/util.h index d2a4904..b9b0969 100644 --- a/src/util.h +++ b/src/util.h @@ -1,11 +1,8 @@ /* logjam - a GTK client for LiveJournal. * Copyright (C) 2000-2005 Evan Martin - * - * vim: tabstop=4 shiftwidth=4 noexpandtab : */ - -#ifndef __logjam_util_h__ -#define __logjam_util_h__ +#ifndef __LOGJAM_UTIL_H__ +#define __LOGJAM_UTIL_H__ void string_replace(char **dest, char *src); -- 2.11.4.GIT