Fri, 07 Feb 2014 21:49:22 +0530
Merge gtkdoc-conversion
--- a/finch/finch.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/finch.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _FINCH_H_ +#define _FINCH_H_ /** * SECTION:finch * @section_id: finch-finch @@ -25,9 +28,6 @@ * @title: UI Definitions and Includes */ -#ifndef _FINCH_H_ -#define _FINCH_H_ - #include <glib.h> #define FINCH_UI "gnt-purple"
--- a/finch/gntaccount.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntaccount.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_ACCOUNT_H +#define _GNT_ACCOUNT_H /** * SECTION:gntaccount * @section_id: finch-gntaccount @@ -25,9 +28,6 @@ * @title: Account API */ -#ifndef _GNT_ACCOUNT_H -#define _GNT_ACCOUNT_H - #include "account.h" /**********************************************************************
--- a/finch/gntblist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntblist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_BLIST_H +#define _GNT_BLIST_H /** * SECTION:gntblist * @section_id: finch-gntblist @@ -25,9 +28,6 @@ * @title: Buddy List API */ -#ifndef _GNT_BLIST_H -#define _GNT_BLIST_H - #include "buddylist.h" #include "gnttree.h"
--- a/finch/gntcertmgr.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntcertmgr.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _GNT_CERTMGR_H +#define _GNT_CERTMGR_H /** * SECTION:gntcertmgr * @section_id: finch-gntcertmgr @@ -26,9 +29,6 @@ * @title: Certificate Manager API */ -#ifndef _GNT_CERTMGR_H -#define _GNT_CERTMGR_H - void finch_certmgr_show(void); #endif
--- a/finch/gntconn.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntconn.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_CONN_H +#define _GNT_CONN_H /** * SECTION:gntconn * @section_id: finch-gntconn @@ -25,9 +28,6 @@ * @title: Connection API */ -#ifndef _GNT_CONN_H -#define _GNT_CONN_H - #include "connection.h" /**********************************************************************
--- a/finch/gntconv.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntconv.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_CONV_H +#define _GNT_CONV_H /** * SECTION:gntconv * @section_id: finch-gntconv @@ -25,9 +28,6 @@ * @title: Conversation API */ -#ifndef _GNT_CONV_H -#define _GNT_CONV_H - #include <gnt.h> #include <gntwidget.h> #include <gntmenuitem.h>
--- a/finch/gntdebug.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntdebug.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_DEBUG_H +#define _GNT_DEBUG_H /** * SECTION:gntdebug * @section_id: finch-gntdebug @@ -25,9 +28,6 @@ * @title: Debug API */ -#ifndef _GNT_DEBUG_H -#define _GNT_DEBUG_H - #include "debug.h" /**********************************************************************
--- a/finch/gntidle.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntidle.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_IDLE_H_ +#define _GNT_IDLE_H_ /** * SECTION:gntidle * @section_id: finch-gntidle @@ -25,9 +28,6 @@ * @title: Idle API */ -#ifndef _GNT_IDLE_H_ -#define _GNT_IDLE_H_ - #include "idle.h" /**************************************************************************/
--- a/finch/gntlog.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntlog.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _FINCHLOG_H_ +#define _FINCHLOG_H_ /** * SECTION:gntlog * @section_id: finch-gntlog @@ -25,9 +28,6 @@ * @title: Log Viewer */ -#ifndef _FINCHLOG_H_ -#define _FINCHLOG_H_ - #include "log.h" #include "account.h" #include "gntwidget.h"
--- a/finch/gntmedia.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntmedia.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_MEDIA_H +#define GNT_MEDIA_H /** * SECTION:gntmedia * @section_id: finch-gntmedia @@ -25,9 +28,6 @@ * @title: Media API */ -#ifndef GNT_MEDIA_H -#define GNT_MEDIA_H - #ifdef HAVE_CONFIG_H #include "config.h" #endif
--- a/finch/gntmenuutil.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntmenuutil.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_MENUUTIL_H +#define _GNT_MENUUTIL_H /** * SECTION:gntmenuutil * @section_id: finch-gntmenuutil @@ -25,9 +28,6 @@ * @title: Menu Utility functions */ -#ifndef _GNT_MENUUTIL_H -#define _GNT_MENUUTIL_H - #include <gnt.h> #include <gntmenu.h>
--- a/finch/gntnotify.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntnotify.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_NOTIFY_H +#define _GNT_NOTIFY_H /** * SECTION:gntnotify * @section_id: finch-gntnotify @@ -25,9 +28,6 @@ * @title: Notify API */ -#ifndef _GNT_NOTIFY_H -#define _GNT_NOTIFY_H - #include "notify.h" /**********************************************************************
--- a/finch/gntplugin.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntplugin.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_PLUGIN_H +#define _GNT_PLUGIN_H /** * SECTION:gntplugin * @section_id: finch-gntplugin @@ -25,9 +28,6 @@ * @title: Plugin API */ -#ifndef _GNT_PLUGIN_H -#define _GNT_PLUGIN_H - #include <gnt.h> #include <plugins.h>
--- a/finch/gntpounce.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntpounce.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _FINCHPOUNCE_H_ +#define _FINCHPOUNCE_H_ /** * SECTION:gntpounce * @section_id: finch-gntpounce @@ -25,9 +28,6 @@ * @title: Buddy Pounce API */ -#ifndef _FINCHPOUNCE_H_ -#define _FINCHPOUNCE_H_ - #include "pounce.h" /**
--- a/finch/gntprefs.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntprefs.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_PREFS_H +#define _GNT_PREFS_H /** * SECTION:gntprefs * @section_id: finch-gntprefs @@ -25,9 +28,6 @@ * @title: Preferences API */ -#ifndef _GNT_PREFS_H -#define _GNT_PREFS_H - /********************************************************************** * GNT Preferences API **********************************************************************/
--- a/finch/gntrequest.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntrequest.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_REQUEST_H +#define _GNT_REQUEST_H /** * SECTION:gntrequest * @section_id: finch-gntrequest @@ -25,9 +28,6 @@ * @title: Request API */ -#ifndef _GNT_REQUEST_H -#define _GNT_REQUEST_H - #include "request.h" #include "gnt.h"
--- a/finch/gntroomlist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntroomlist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_ROOMLIST_H +#define _GNT_ROOMLIST_H /** * SECTION:gntroomlist * @section_id: finch-gntroomlist @@ -25,9 +28,6 @@ * @title: Room List API */ -#ifndef _GNT_ROOMLIST_H -#define _GNT_ROOMLIST_H - #include "roomlist.h" /**********************************************************************
--- a/finch/gntsound.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntsound.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_SOUND_H +#define _GNT_SOUND_H /** * SECTION:gntsound * @section_id: finch-gntsound @@ -25,9 +28,6 @@ * @title: Sound API */ -#ifndef _GNT_SOUND_H -#define _GNT_SOUND_H - #include "sound.h" /**********************************************************************/
--- a/finch/gntstatus.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntstatus.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_STATUS_H +#define _GNT_STATUS_H /** * SECTION:gntstatus * @section_id: finch-gntstatus @@ -25,9 +28,6 @@ * @title: Status API */ -#ifndef _GNT_STATUS_H -#define _GNT_STATUS_H - #include <status.h> #include <savedstatuses.h>
--- a/finch/gntui.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntui.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_UI_H +#define _GNT_UI_H /** * SECTION:gntui * @section_id: finch-gntui @@ -26,9 +29,6 @@ * @title: Startup and Shutdown UI */ -#ifndef _GNT_UI_H -#define _GNT_UI_H - #include "gnt.h" void gnt_ui_init(void);
--- a/finch/gntxfer.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/gntxfer.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GNT_XFER_H_ +#define _GNT_XFER_H_ /** * SECTION:gntxfer * @section_id: finch-gntxfer @@ -25,9 +28,6 @@ * @title: File Transfer UI */ -#ifndef _GNT_XFER_H_ -#define _GNT_XFER_H_ - #include "xfer.h"
--- a/finch/libgnt/gnt-skel.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gnt-skel.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_SKEL_H +#define GNT_SKEL_H /* * SECTION:gnt-skel * @section_id: libgnt-gnt-skel @@ -26,9 +29,6 @@ * @title: Skel API */ -#ifndef GNT_SKEL_H -#define GNT_SKEL_H - #include "gntwidget.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gnt.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gnt.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_H +#define GNT_H /** * SECTION:gnt * @section_id: libgnt-gnt @@ -26,9 +29,6 @@ * @title: GNT API */ -#ifndef GNT_H -#define GNT_H - #include <glib.h> #include "gntwidget.h" #include "gntclipboard.h"
--- a/finch/libgnt/gntbindable.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntbindable.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_BINDABLE_H +#define GNT_BINDABLE_H /** * SECTION:gntbindable * @section_id: libgnt-gntbindable @@ -26,9 +29,6 @@ * @title: Bindable */ -#ifndef GNT_BINDABLE_H -#define GNT_BINDABLE_H - #include <stdio.h> #include <glib.h> #include <glib-object.h>
--- a/finch/libgnt/gntbox.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntbox.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_BOX_H +#define GNT_BOX_H /** * SECTION:gntbox * @section_id: libgnt-gntbox @@ -26,9 +29,6 @@ * @title: Box */ -#ifndef GNT_BOX_H -#define GNT_BOX_H - #include "gnt.h" #include "gntwidget.h"
--- a/finch/libgnt/gntbutton.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntbutton.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_BUTTON_H +#define GNT_BUTTON_H /** * SECTION:gntbutton * @section_id: libgnt-gntbutton @@ -26,9 +29,6 @@ * @title: Button */ -#ifndef GNT_BUTTON_H -#define GNT_BUTTON_H - #include <glib.h> #include <glib-object.h> #include "gnt.h"
--- a/finch/libgnt/gntcheckbox.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntcheckbox.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_CHECK_BOX_H +#define GNT_CHECK_BOX_H /** * SECTION:gntcheckbox * @section_id: libgnt-gntcheckbox @@ -26,9 +29,6 @@ * @title: Checkbox */ -#ifndef GNT_CHECK_BOX_H -#define GNT_CHECK_BOX_H - #include "gntbutton.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gntclipboard.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntclipboard.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_CLIPBOARD_H +#define GNT_CLIPBOARD_H /** * SECTION:gntclipboard * @section_id: libgnt-gntclipboard @@ -26,9 +29,6 @@ * @title: Clipboard */ -#ifndef GNT_CLIPBOARD_H -#define GNT_CLIPBOARD_H - #include <stdio.h> #include <glib.h> #include <glib-object.h>
--- a/finch/libgnt/gntcolors.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntcolors.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_COLORS_H +#define GNT_COLORS_H /** * SECTION:gntcolors * @section_id: libgnt-gntcolors @@ -26,9 +29,6 @@ * @title: Colors */ -#ifndef GNT_COLORS_H -#define GNT_COLORS_H - #include <glib.h> /**
--- a/finch/libgnt/gntcombobox.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntcombobox.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_COMBO_BOX_H +#define GNT_COMBO_BOX_H /** * SECTION:gntcombobox * @section_id: libgnt-gntcombobox @@ -26,9 +29,6 @@ * @title: Combobox */ -#ifndef GNT_COMBO_BOX_H -#define GNT_COMBO_BOX_H - #include "gnt.h" #include "gntcolors.h" #include "gntkeys.h"
--- a/finch/libgnt/gntentry.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntentry.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_ENTRY_H +#define GNT_ENTRY_H /** * SECTION:gntentry * @section_id: libgnt-gntentry @@ -26,9 +29,6 @@ * @title: Entry */ -#ifndef GNT_ENTRY_H -#define GNT_ENTRY_H - #include "gntwidget.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gntfilesel.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntfilesel.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_FILE_SEL_H +#define GNT_FILE_SEL_H /** * SECTION:gntfilesel * @section_id: libgnt-gntfilesel @@ -26,9 +29,6 @@ * @title: File Selector */ -#ifndef GNT_FILE_SEL_H -#define GNT_FILE_SEL_H - #include "gntwindow.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gntkeys.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntkeys.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_KEYS_H +#define GNT_KEYS_H /** * SECTION:gntkeys * @section_id: libgnt-gntkeys @@ -26,9 +29,6 @@ * @title: Keys API */ -#ifndef GNT_KEYS_H -#define GNT_KEYS_H - #include <curses.h> #include <term.h>
--- a/finch/libgnt/gntlabel.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntlabel.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_LABEL_H +#define GNT_LABEL_H /** * SECTION:gntlabel * @section_id: libgnt-gntlabel @@ -26,9 +29,6 @@ * @title: Label */ -#ifndef GNT_LABEL_H -#define GNT_LABEL_H - #include "gnt.h" #include "gntwidget.h" #include "gnttextview.h"
--- a/finch/libgnt/gntline.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntline.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_LINE_H +#define GNT_LINE_H /** * SECTION:gntline * @section_id: libgnt-gntline @@ -26,9 +29,6 @@ * @title: Line */ -#ifndef GNT_LINE_H -#define GNT_LINE_H - #include "gntwidget.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gntmenu.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntmenu.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_MENU_H +#define GNT_MENU_H /** * SECTION:gntmenu * @section_id: libgnt-gntmenu @@ -26,9 +29,6 @@ * @title: Menu */ -#ifndef GNT_MENU_H -#define GNT_MENU_H - #include "gnttree.h" #include "gntcolors.h" #include "gntkeys.h"
--- a/finch/libgnt/gntmenuitem.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntmenuitem.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_MENUITEM_H +#define GNT_MENUITEM_H /** * SECTION:gntmenuitem * @section_id: libgnt-gntmenuitem @@ -26,9 +29,6 @@ * @title: Menuitem */ -#ifndef GNT_MENUITEM_H -#define GNT_MENUITEM_H - #include <glib.h> #include <glib-object.h>
--- a/finch/libgnt/gntmenuitemcheck.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntmenuitemcheck.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_MENU_ITEM_CHECK_H +#define GNT_MENU_ITEM_CHECK_H /** * SECTION:gntmenuitemcheck * @section_id: libgnt-gntmenuitemcheck @@ -26,9 +29,6 @@ * @title: Check Menuitem */ -#ifndef GNT_MENU_ITEM_CHECK_H -#define GNT_MENU_ITEM_CHECK_H - #include "gnt.h" #include "gntcolors.h" #include "gntkeys.h"
--- a/finch/libgnt/gntprogressbar.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntprogressbar.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_PROGRESS_BAR_H +#define GNT_PROGRESS_BAR_H /** * SECTION:gntprogressbar * @section_id: libgnt-gntprogressbar @@ -26,9 +29,6 @@ * @title: Progress Bar */ -#ifndef GNT_PROGRESS_BAR_H -#define GNT_PROGRESS_BAR_H - #include "gnt.h" #include "gntwidget.h"
--- a/finch/libgnt/gntslider.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntslider.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_SLIDER_H +#define GNT_SLIDER_H /** * SECTION:gntslider * @section_id: libgnt-gntslider @@ -26,9 +29,6 @@ * @title: Slider */ -#ifndef GNT_SLIDER_H -#define GNT_SLIDER_H - #include "gntwidget.h" #include "gnt.h" #include "gntlabel.h"
--- a/finch/libgnt/gntstyle.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntstyle.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_STYLE_H +#define GNT_STYLE_H /** * SECTION:gntstyle * @section_id: libgnt-gntstyle @@ -173,4 +176,4 @@ */ void gnt_uninit_styles(void); - +#endif /* GNT_STYLE_H */
--- a/finch/libgnt/gnttextview.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gnttextview.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_TEXT_VIEW_H +#define GNT_TEXT_VIEW_H /** * SECTION:gnttextview * @section_id: libgnt-gnttextview @@ -26,9 +29,6 @@ * @title: Textview */ -#ifndef GNT_TEXT_VIEW_H -#define GNT_TEXT_VIEW_H - #include "gntwidget.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gnttree.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gnttree.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_TREE_H +#define GNT_TREE_H /** * SECTION:gnttree * @section_id: libgnt-gnttree @@ -26,9 +29,6 @@ * @title: Tree */ -#ifndef GNT_TREE_H -#define GNT_TREE_H - #include "gntwidget.h" #include "gnt.h" #include "gntcolors.h"
--- a/finch/libgnt/gntutils.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntutils.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_UTILS_H +#define GNT_UTILS_H /** * SECTION:gntutils * @section_id: libgnt-gntutils @@ -162,3 +165,4 @@ */ void gnt_util_set_trigger_widget(GntWidget *widget, const char *key, GntWidget *button); +#endif /* GNT_UTILS_H */
--- a/finch/libgnt/gntwidget.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntwidget.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_WIDGET_H +#define GNT_WIDGET_H /** * SECTION:gntwidget * @section_id: libgnt-gntwidget @@ -26,9 +29,6 @@ * @title: Widget */ -#ifndef GNT_WIDGET_H -#define GNT_WIDGET_H - #include <stdio.h> #include <glib.h> #include <ncurses.h>
--- a/finch/libgnt/gntwindow.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntwindow.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNT_WINDOW_H +#define GNT_WINDOW_H /** * SECTION:gntwindow * @section_id: libgnt-gntwindow @@ -26,9 +29,6 @@ * @title: Window */ -#ifndef GNT_WINDOW_H -#define GNT_WINDOW_H - #include "gnt.h" #include "gntbox.h" #include "gntcolors.h"
--- a/finch/libgnt/gntwm.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntwm.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNTWM_H +#define GNTWM_H /** * SECTION:gntwm * @section_id: libgnt-gntwm @@ -26,9 +29,6 @@ * @title: Window-manager API */ -#ifndef GNTWM_H -#define GNTWM_H - #include "gntwidget.h" #include "gntmenu.h" #include "gntws.h"
--- a/finch/libgnt/gntws.h Fri Feb 07 18:22:36 2014 +0530 +++ b/finch/libgnt/gntws.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef GNTWS_H +#define GNTWS_H /** * SECTION:gntws * @section_id: libgnt-gntws @@ -26,9 +29,6 @@ * @title: Workspace API */ -#ifndef GNTWS_H -#define GNTWS_H - #include "gntwidget.h" #include <panel.h>
--- a/libpurple/account.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/account.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_ACCOUNT_H_ +#define _PURPLE_ACCOUNT_H_ /** * SECTION:account * @section_id: libpurple-account @@ -25,9 +28,6 @@ * @title: Account Object */ -#ifndef _PURPLE_ACCOUNT_H_ -#define _PURPLE_ACCOUNT_H_ - #include <glib.h> #include <glib-object.h>
--- a/libpurple/accountopt.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/accountopt.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_ACCOUNTOPT_H_ +#define _PURPLE_ACCOUNTOPT_H_ /** * SECTION:accountopt * @section_id: libpurple-accountopt @@ -25,9 +28,6 @@ * @title: Account Options API */ -#ifndef _PURPLE_ACCOUNTOPT_H_ -#define _PURPLE_ACCOUNTOPT_H_ - #include "prefs.h" /**************************************************************************/
--- a/libpurple/accounts.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/accounts.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_ACCOUNTS_H_ +#define _PURPLE_ACCOUNTS_H_ /** * SECTION:accounts * @section_id: libpurple-accounts @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-account">Account signals</link> */ -#ifndef _PURPLE_ACCOUNTS_H_ -#define _PURPLE_ACCOUNTS_H_ - #include "account.h" #include "status.h"
--- a/libpurple/blistnode.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/blistnode.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_BLIST_NODE_H_ +#define _PURPLE_BLIST_NODE_H_ /** * SECTION:blistnode * @section_id: libpurple-blistnode @@ -25,9 +28,6 @@ * @title: Buddy List Node and Counting Node types */ -#ifndef _PURPLE_BLIST_NODE_H_ -#define _PURPLE_BLIST_NODE_H_ - #include <glib.h> #include <glib-object.h>
--- a/libpurple/blistnodetypes.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/blistnodetypes.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_BLISTNODE_TYPES_H_ +#define _PURPLE_BLISTNODE_TYPES_H_ /** * SECTION:blistnodetypes * @section_id: libpurple-blistnodetypes @@ -25,9 +28,6 @@ * @title: Buddy, Chat, Contact and Group node Objects */ -#ifndef _PURPLE_BLISTNODE_TYPES_H_ -#define _PURPLE_BLISTNODE_TYPES_H_ - #include "blistnode.h" #define PURPLE_TYPE_BUDDY (purple_buddy_get_type())
--- a/libpurple/buddyicon.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/buddyicon.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_BUDDYICON_H_ +#define _PURPLE_BUDDYICON_H_ /** * SECTION:buddyicon * @section_id: libpurple-buddyicon @@ -25,9 +28,6 @@ * @title: Buddy Icon API */ -#ifndef _PURPLE_BUDDYICON_H_ -#define _PURPLE_BUDDYICON_H_ - #define PURPLE_TYPE_BUDDY_ICON (purple_buddy_icon_get_type()) /**
--- a/libpurple/buddylist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/buddylist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_BUDDY_LIST_H_ +#define _PURPLE_BUDDY_LIST_H_ /** * SECTION:buddylist * @section_id: libpurple-buddylist @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-blist">Buddy List signals</link> */ -#ifndef _PURPLE_BUDDY_LIST_H_ -#define _PURPLE_BUDDY_LIST_H_ - /* I can't believe I let ChipX86 inspire me to write good code. -Sean */ #include "blistnodetypes.h"
--- a/libpurple/certificate.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/certificate.h Fri Feb 07 21:49:22 2014 +0530 @@ -20,6 +20,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CERTIFICATE_H +#define _PURPLE_CERTIFICATE_H /** * SECTION:certificate * @section_id: libpurple-certificate @@ -28,9 +31,6 @@ * @see_also: <link linkend="chapter-signals-certificate">Certificate signals</link> */ -#ifndef _PURPLE_CERTIFICATE_H -#define _PURPLE_CERTIFICATE_H - #include <time.h> #include <glib.h>
--- a/libpurple/cipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/cipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_CIPHER_H +#define PURPLE_CIPHER_H /** * SECTION:cipher * @section_id: libpurple-cipher @@ -25,9 +28,6 @@ * @title: Cipher and Hash API */ -#ifndef PURPLE_CIPHER_H -#define PURPLE_CIPHER_H - #include <glib.h> #include <glib-object.h> #include <string.h>
--- a/libpurple/ciphers/aescipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/aescipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_AES_CIPHER_H +#define PURPLE_AES_CIPHER_H /** * SECTION:aescipher * @section_id: libpurple-aescipher @@ -25,9 +28,6 @@ * @title: AES Cipher */ -#ifndef PURPLE_AES_CIPHER_H -#define PURPLE_AES_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_AES_CIPHER (purple_aes_cipher_get_type())
--- a/libpurple/ciphers/des3cipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/des3cipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_DES3_CIPHER_H +#define PURPLE_DES3_CIPHER_H /** * SECTION:des3cipher * @section_id: libpurple-des3cipher @@ -25,9 +28,6 @@ * @title: Triple-DES Cipher */ -#ifndef PURPLE_DES3_CIPHER_H -#define PURPLE_DES3_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_DES3_CIPHER (purple_des3_cipher_get_type())
--- a/libpurple/ciphers/descipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/descipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#ifndef PURPLE_DES_CIPHER_H +#define PURPLE_DES_CIPHER_H /** * SECTION:descipher * @section_id: libpurple-descipher @@ -25,9 +28,6 @@ * @title: DES Cipher */ -#ifndef PURPLE_DES_CIPHER_H -#define PURPLE_DES_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_DES_CIPHER (purple_des_cipher_get_type())
--- a/libpurple/ciphers/hmaccipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/hmaccipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_HMAC_CIPHER_H +#define PURPLE_HMAC_CIPHER_H /** * SECTION:hmaccipher * @section_id: libpurple-hmaccipher @@ -25,9 +28,6 @@ * @title: HMAC Cipher */ -#ifndef PURPLE_HMAC_CIPHER_H -#define PURPLE_HMAC_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_HMAC_CIPHER (purple_hmac_cipher_get_type())
--- a/libpurple/ciphers/md4hash.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/md4hash.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#ifndef PURPLE_MD4_HASH_H +#define PURPLE_MD4_HASH_H /** * SECTION:md4hash * @section_id: libpurple-md4hash @@ -26,9 +29,6 @@ * @title: MD4 Hash */ -#ifndef PURPLE_MD4_HASH_H -#define PURPLE_MD4_HASH_H - #include "cipher.h" #define PURPLE_TYPE_MD4_HASH (purple_md4_hash_get_type())
--- a/libpurple/ciphers/md5hash.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/md5hash.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_MD5_HASH_H +#define PURPLE_MD5_HASH_H /** * SECTION:md5hash * @section_id: libpurple-md5hash @@ -25,9 +28,6 @@ * @title: MD5 Hash */ -#ifndef PURPLE_MD5_HASH_H -#define PURPLE_MD5_HASH_H - #include "cipher.h" #define PURPLE_TYPE_MD5_HASH (purple_md5_hash_get_type())
--- a/libpurple/ciphers/pbkdf2cipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/pbkdf2cipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_PBKDF2_CIPHER_H +#define PURPLE_PBKDF2_CIPHER_H /** * SECTION:pbkdf2cipher * @section_id: libpurple-pbkdf2cipher @@ -25,9 +28,6 @@ * @title: PBKDF2 Cipher */ -#ifndef PURPLE_PBKDF2_CIPHER_H -#define PURPLE_PBKDF2_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_PBKDF2_CIPHER (purple_pbkdf2_cipher_get_type())
--- a/libpurple/ciphers/rc4cipher.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/rc4cipher.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_RC4_CIPHER_H +#define PURPLE_RC4_CIPHER_H /** * SECTION:rc4cipher * @section_id: libpurple-rc4cipher @@ -25,9 +28,6 @@ * @title: RC4 Cipher */ -#ifndef PURPLE_RC4_CIPHER_H -#define PURPLE_RC4_CIPHER_H - #include "cipher.h" #define PURPLE_TYPE_RC4_CIPHER (purple_rc4_cipher_get_type())
--- a/libpurple/ciphers/sha1hash.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/sha1hash.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_SHA1_HASH_H +#define PURPLE_SHA1_HASH_H /** * SECTION:sha1hash * @section_id: libpurple-sha1hash @@ -25,9 +28,6 @@ * @title: SHA1 Hash */ -#ifndef PURPLE_SHA1_HASH_H -#define PURPLE_SHA1_HASH_H - #include "cipher.h" #define PURPLE_TYPE_SHA1_HASH (purple_sha1_hash_get_type())
--- a/libpurple/ciphers/sha256hash.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ciphers/sha256hash.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_SHA256_HASH_H +#define PURPLE_SHA256_HASH_H /** * SECTION:sha256hash * @section_id: libpurple-sha256hash @@ -25,9 +28,6 @@ * @title: SHA256 Hash */ -#ifndef PURPLE_SHA256_HASH_H -#define PURPLE_SHA256_HASH_H - #include "cipher.h" #define PURPLE_TYPE_SHA256_HASH (purple_sha256_hash_get_type())
--- a/libpurple/circularbuffer.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/circularbuffer.h Fri Feb 07 21:49:22 2014 +0530 @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_CIRCULAR_BUFFER_H +#define PURPLE_CIRCULAR_BUFFER_H /** * SECTION:circularbuffer * @section_id: libpurple-circularbuffer @@ -23,9 +26,6 @@ * @title: Buffer Utility Functions */ -#ifndef PURPLE_CIRCULAR_BUFFER_H -#define PURPLE_CIRCULAR_BUFFER_H - #include <glib.h> #include <glib-object.h>
--- a/libpurple/cmds.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/cmds.h Fri Feb 07 21:49:22 2014 +0530 @@ -15,6 +15,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_CMDS_H_ +#define _PURPLE_CMDS_H_ /** * SECTION:cmds * @section_id: libpurple-cmds @@ -23,9 +26,6 @@ * @see_also: <link linkend="chapter-signals-cmd">Command signals</link> */ -#ifndef _PURPLE_CMDS_H_ -#define _PURPLE_CMDS_H_ - #include "conversation.h" /**************************************************************************/
--- a/libpurple/connection.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/connection.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CONNECTION_H_ +#define _PURPLE_CONNECTION_H_ /** * SECTION:connection * @section_id: libpurple-connection @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-connection">Connection signals</link> */ -#ifndef _PURPLE_CONNECTION_H_ -#define _PURPLE_CONNECTION_H_ - #define PURPLE_TYPE_CONNECTION (purple_connection_get_type()) #define PURPLE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_CONNECTION, PurpleConnection)) #define PURPLE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_CONNECTION, PurpleConnectionClass))
--- a/libpurple/conversation.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/conversation.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CONVERSATION_H_ +#define _PURPLE_CONVERSATION_H_ /** * SECTION:conversation * @section_id: libpurple-conversation @@ -25,9 +28,6 @@ * @title: Conversation Base Class */ -#ifndef _PURPLE_CONVERSATION_H_ -#define _PURPLE_CONVERSATION_H_ - #define PURPLE_TYPE_CONVERSATION (purple_conversation_get_type()) #define PURPLE_CONVERSATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_CONVERSATION, PurpleConversation)) #define PURPLE_CONVERSATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_CONVERSATION, PurpleConversationClass))
--- a/libpurple/conversations.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/conversations.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CONVERSATIONS_H_ +#define _PURPLE_CONVERSATIONS_H_ /** * SECTION:conversations * @section_id: libpurple-conversations @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-conversation">Conversation signals</link> */ -#ifndef _PURPLE_CONVERSATIONS_H_ -#define _PURPLE_CONVERSATIONS_H_ - #include "conversationtypes.h" #include "server.h"
--- a/libpurple/conversationtypes.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/conversationtypes.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CONVERSATION_TYPES_H_ +#define _PURPLE_CONVERSATION_TYPES_H_ /** * SECTION:conversationtypes * @section_id: libpurple-conversationtypes @@ -25,9 +28,6 @@ * @title: Chat and IM Conversation Objects */ -#ifndef _PURPLE_CONVERSATION_TYPES_H_ -#define _PURPLE_CONVERSATION_TYPES_H_ - /**************************************************************************/ /** Data Structures */ /**************************************************************************/
--- a/libpurple/core.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/core.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_CORE_H_ +#define _PURPLE_CORE_H_ /** * SECTION:core * @section_id: libpurple-core @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-core">Core signals</link> */ -#ifndef _PURPLE_CORE_H_ -#define _PURPLE_CORE_H_ - #include <glib.h> typedef struct PurpleCore PurpleCore;
--- a/libpurple/dbus-bindings.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dbus-bindings.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_DBUS_BINDINGS_H_ +#define _PURPLE_DBUS_BINDINGS_H_ /** * SECTION:dbus-bindings * @section_id: libpurple-dbus-bindings @@ -26,9 +29,6 @@ * @title: DBUS Bindings */ -#ifndef _PURPLE_DBUS_BINDINGS_H_ -#define _PURPLE_DBUS_BINDINGS_H_ - #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> #include <glib.h>
--- a/libpurple/dbus-maybe.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dbus-maybe.h Fri Feb 07 21:49:22 2014 +0530 @@ -1,3 +1,5 @@ +#ifndef _PURPLE_DBUS_MAYBE_H_ +#define _PURPLE_DBUS_MAYBE_H_ /** * SECTION:dbus-maybe * @section_id: libpurple-dbus-maybe @@ -10,9 +12,6 @@ * documentation. */ -#ifndef _PURPLE_DBUS_MAYBE_H_ -#define _PURPLE_DBUS_MAYBE_H_ - #ifdef HAVE_DBUS #ifndef DBUS_API_SUBJECT_TO_CHANGE
--- a/libpurple/dbus-purple.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dbus-purple.h Fri Feb 07 21:49:22 2014 +0530 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _DBUS_PURPLE_H_ +#define _DBUS_PURPLE_H_ /** * SECTION:dbus-purple * @section_id: libpurple-dbus-purple @@ -27,9 +30,6 @@ * @title: DBUS Purple defines */ -#ifndef _DBUS_PURPLE_H_ -#define _DBUS_PURPLE_H_ - #define DBUS_SERVICE_PURPLE "im.pidgin.purple.PurpleService" #define DBUS_PATH_PURPLE "/im/pidgin/purple/PurpleObject" #define DBUS_INTERFACE_PURPLE "im.pidgin.purple.PurpleInterface"
--- a/libpurple/dbus-server.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dbus-server.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_DBUS_SERVER_H_ +#define _PURPLE_DBUS_SERVER_H_ /** * SECTION:dbus-server * @section_id: libpurple-dbus-server @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-dbus-server">D-Bus Server signals</link> */ -#ifndef _PURPLE_DBUS_SERVER_H_ -#define _PURPLE_DBUS_SERVER_H_ - #include "dbus-purple.h" G_BEGIN_DECLS
--- a/libpurple/dbus-useful.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dbus-useful.h Fri Feb 07 21:49:22 2014 +0530 @@ -1,3 +1,5 @@ +#ifndef _PURPLE_DBUS_USEFUL_H_ +#define _PURPLE_DBUS_USEFUL_H_ /** * SECTION:dbus-useful * @section_id: libpurple-dbus-useful @@ -18,3 +20,4 @@ G_END_DECLS +#endif
--- a/libpurple/debug.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/debug.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_DEBUG_H_ +#define _PURPLE_DEBUG_H_ /** * SECTION:debug * @section_id: libpurple-debug @@ -25,9 +28,6 @@ * @title: Debug API */ -#ifndef _PURPLE_DEBUG_H_ -#define _PURPLE_DEBUG_H_ - #include <glib.h> #include <stdarg.h>
--- a/libpurple/desktopitem.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/desktopitem.h Fri Feb 07 21:49:22 2014 +0530 @@ -17,12 +17,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ -/** - * SECTION:desktopitem - * @section_id: libpurple-desktopitem - * @short_description: <filename>desktopitem.h</filename> - * @title: Managing .desktop files - */ /* * The following code has been adapted from gnome-desktop-item.[ch], @@ -56,6 +50,12 @@ #ifndef _PURPLE_DESKTOP_ITEM_H_ #define _PURPLE_DESKTOP_ITEM_H_ +/** + * SECTION:desktopitem + * @section_id: libpurple-desktopitem + * @short_description: <filename>desktopitem.h</filename> + * @title: Managing .desktop files + */ #include <glib.h> #include <glib-object.h>
--- a/libpurple/dnsquery.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dnsquery.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_DNSQUERY_H_ +#define _PURPLE_DNSQUERY_H_ /** * SECTION:dnsquery * @section_id: libpurple-dnsquery @@ -25,9 +28,6 @@ * @title: DNS Query API */ -#ifndef _PURPLE_DNSQUERY_H_ -#define _PURPLE_DNSQUERY_H_ - #include <glib.h> #include "eventloop.h" #include "account.h"
--- a/libpurple/dnssrv.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/dnssrv.h Fri Feb 07 21:49:22 2014 +0530 @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_DNSSRV_H +#define _PURPLE_DNSSRV_H /** * SECTION:dnssrv * @section_id: libpurple-dnssrv @@ -23,9 +26,6 @@ * @title: DNS SRV Utilities */ -#ifndef _PURPLE_DNSSRV_H -#define _PURPLE_DNSSRV_H - typedef struct _PurpleSrvTxtQueryData PurpleSrvTxtQueryData; typedef struct _PurpleSrvResponse PurpleSrvResponse; typedef struct _PurpleTxtResponse PurpleTxtResponse;
--- a/libpurple/e2ee.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/e2ee.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_E2EE_H_ +#define _PURPLE_E2EE_H_ /** * SECTION:e2ee * @section_id: libpurple-e2ee @@ -25,9 +28,6 @@ * @title: End-to-end Encryption API */ -#ifndef _PURPLE_E2EE_H_ -#define _PURPLE_E2EE_H_ - typedef struct _PurpleE2eeState PurpleE2eeState; typedef struct _PurpleE2eeProvider PurpleE2eeProvider;
--- a/libpurple/enums.h.in Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/enums.h.in Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_ENUMS_H +#define PURPLE_ENUMS_H /** * SECTION:enums * @section_id: libpurple-enums @@ -28,9 +31,6 @@ * This file contains all the #GEnum and #GFlags type definitions of libpurple. */ -#ifndef PURPLE_ENUMS_H -#define PURPLE_ENUMS_H - #include <glib-object.h> G_BEGIN_DECLS
--- a/libpurple/eventloop.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/eventloop.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_EVENTLOOP_H_ +#define _PURPLE_EVENTLOOP_H_ /** * SECTION:eventloop * @section_id: libpurple-eventloop @@ -25,9 +28,6 @@ * @title: Event Loop API */ -#ifndef _PURPLE_EVENTLOOP_H_ -#define _PURPLE_EVENTLOOP_H_ - #include <glib.h> /**
--- a/libpurple/glibcompat.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/glibcompat.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _GLIBCOMPAT_H_ +#define _GLIBCOMPAT_H_ /* * SECTION:glibcompat * @section_id: libpurple-glibcompat @@ -28,9 +31,6 @@ * Also, any public API should not depend on this file. */ -#ifndef _GLIBCOMPAT_H_ -#define _GLIBCOMPAT_H_ - #include <glib.h>
--- a/libpurple/http.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/http.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_HTTP_H_ +#define _PURPLE_HTTP_H_ /** * SECTION:http * @section_id: libpurple-http @@ -25,9 +28,6 @@ * @title: HTTP API */ -#ifndef _PURPLE_HTTP_H_ -#define _PURPLE_HTTP_H_ - #include <glib.h> #include "connection.h"
--- a/libpurple/idle.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/idle.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_IDLE_H_ +#define _PURPLE_IDLE_H_ /** * SECTION:idle * @section_id: libpurple-idle @@ -25,9 +28,6 @@ * @title: Idle API */ -#ifndef _PURPLE_IDLE_H_ -#define _PURPLE_IDLE_H_ - #include <time.h> typedef struct _PurpleIdleUiOps PurpleIdleUiOps;
--- a/libpurple/imgstore.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/imgstore.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_IMGSTORE_H_ +#define _PURPLE_IMGSTORE_H_ /** * SECTION:imgstore * @section_id: libpurple-imgstore @@ -29,9 +32,6 @@ * data. */ -#ifndef _PURPLE_IMGSTORE_H_ -#define _PURPLE_IMGSTORE_H_ - #include <glib.h> #define PURPLE_STORED_IMAGE_PROTOCOL "purple-image:"
--- a/libpurple/internal.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/internal.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_INTERNAL_H_ +#define _PURPLE_INTERNAL_H_ /* * SECTION:internal * @section_id: libpurple-internal @@ -25,9 +28,6 @@ * @title: Internal definitions and includes */ -#ifndef _PURPLE_INTERNAL_H_ -#define _PURPLE_INTERNAL_H_ - #ifdef HAVE_CONFIG_H # include <config.h> #endif
--- a/libpurple/keyring.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/keyring.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_KEYRING_H_ +#define _PURPLE_KEYRING_H_ /** * SECTION:keyring * @section_id: libpurple-keyring @@ -25,9 +28,6 @@ * @title: Keyring API */ -#ifndef _PURPLE_KEYRING_H_ -#define _PURPLE_KEYRING_H_ - #include "account.h" #include "request.h"
--- a/libpurple/log.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/log.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_LOG_H_ +#define _PURPLE_LOG_H_ /** * SECTION:log * @section_id: libpurple-log @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-log">Log signals</link> */ -#ifndef _PURPLE_LOG_H_ -#define _PURPLE_LOG_H_ - #include <stdio.h> #define PURPLE_TYPE_LOG (purple_log_get_type())
--- a/libpurple/media-gst.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media-gst.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_GST_H_ +#define _PURPLE_MEDIA_GST_H_ /** * SECTION:media-gst * @section_id: libpurple-media-gst @@ -25,9 +28,6 @@ * @title: Media Element API */ -#ifndef _PURPLE_MEDIA_GST_H_ -#define _PURPLE_MEDIA_GST_H_ - #include "media.h" #include "mediamanager.h"
--- a/libpurple/media.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_H_ +#define _PURPLE_MEDIA_H_ /** * SECTION:media * @section_id: libpurple-media @@ -25,9 +28,6 @@ * @title: Media Object API */ -#ifndef _PURPLE_MEDIA_H_ -#define _PURPLE_MEDIA_H_ - #include <glib.h> #include <glib-object.h>
--- a/libpurple/media/backend-fs2.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media/backend-fs2.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _MEDIA_BACKEND_FS2_H_ +#define _MEDIA_BACKEND_FS2_H_ /* * SECTION:backend-fs2 * @section_id: libpurple-backend-fs2 @@ -28,9 +31,6 @@ * It should remain internal only for now. */ -#ifndef _MEDIA_BACKEND_FS2_H_ -#define _MEDIA_BACKEND_FS2_H_ - #include <glib-object.h> G_BEGIN_DECLS
--- a/libpurple/media/backend-iface.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media/backend-iface.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _MEDIA_BACKEND_IFACE_H_ +#define _MEDIA_BACKEND_IFACE_H_ /** * SECTION:backend-iface * @section_id: libpurple-backend-iface @@ -25,9 +28,6 @@ * @title: Interface for Media Backends */ -#ifndef _MEDIA_BACKEND_IFACE_H_ -#define _MEDIA_BACKEND_IFACE_H_ - #include "codec.h" #include "enum-types.h"
--- a/libpurple/media/candidate.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media/candidate.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_CANDIDATE_H_ +#define _PURPLE_MEDIA_CANDIDATE_H_ /** * SECTION:candidate * @section_id: libpurple-candidate @@ -25,9 +28,6 @@ * @title: Candidate for Media API */ -#ifndef _PURPLE_MEDIA_CANDIDATE_H_ -#define _PURPLE_MEDIA_CANDIDATE_H_ - #include "enum-types.h" #include <glib-object.h>
--- a/libpurple/media/codec.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media/codec.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_CODEC_H_ +#define _PURPLE_MEDIA_CODEC_H_ /** * SECTION:codec * @section_id: libpurple-codec @@ -25,9 +28,6 @@ * @title: Codec for Media API */ -#ifndef _PURPLE_MEDIA_CODEC_H_ -#define _PURPLE_MEDIA_CODEC_H_ - #include "enum-types.h" /**
--- a/libpurple/media/enum-types.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/media/enum-types.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_ENUM_TYPES_H_ +#define _PURPLE_MEDIA_ENUM_TYPES_H_ /** * SECTION:enum-types * @section_id: libpurple-enum-types @@ -25,9 +28,6 @@ * @title: Enum types for Media API */ -#ifndef _PURPLE_MEDIA_ENUM_TYPES_H_ -#define _PURPLE_MEDIA_ENUM_TYPES_H_ - #include <glib-object.h> G_BEGIN_DECLS
--- a/libpurple/mediamanager.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/mediamanager.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_MEDIA_MANAGER_H_ +#define _PURPLE_MEDIA_MANAGER_H_ /** * SECTION:mediamanager * @section_id: libpurple-mediamanager @@ -25,9 +28,6 @@ * @title: Media Manager Object */ -#ifndef _PURPLE_MEDIA_MANAGER_H_ -#define _PURPLE_MEDIA_MANAGER_H_ - #include <glib.h> #include <glib-object.h>
--- a/libpurple/mime.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/mime.h Fri Feb 07 21:49:22 2014 +0530 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */ + +#ifndef _PURPLE_MIME_H +#define _PURPLE_MIME_H /** * SECTION:mime * @section_id: libpurple-mime @@ -30,9 +33,6 @@ * accessible structures. */ -#ifndef _PURPLE_MIME_H -#define _PURPLE_MIME_H - #include <glib.h> /**
--- a/libpurple/nat-pmp.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/nat-pmp.h Fri Feb 07 21:49:22 2014 +0530 @@ -23,6 +23,9 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. */ + +#ifndef _PURPLE_NAT_PMP_H +#define _PURPLE_NAT_PMP_H /** * SECTION:nat-pmp * @section_id: libpurple-nat-pmp @@ -30,9 +33,6 @@ * @title: NAT-PMP Implementation */ -#ifndef _PURPLE_NAT_PMP_H -#define _PURPLE_NAT_PMP_H - #include <glib.h> #define PURPLE_PMP_LIFETIME 3600 /* 3600 seconds */
--- a/libpurple/network.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/network.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_NETWORK_H_ +#define _PURPLE_NETWORK_H_ /** * SECTION:network * @section_id: libpurple-network @@ -25,9 +28,6 @@ * @title: Network API */ -#ifndef _PURPLE_NETWORK_H_ -#define _PURPLE_NETWORK_H_ - #include <glib.h> G_BEGIN_DECLS
--- a/libpurple/notify.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/notify.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_NOTIFY_H_ +#define _PURPLE_NOTIFY_H_ /** * SECTION:notify * @section_id: libpurple-notify @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-notify">Notify signals</link> */ -#ifndef _PURPLE_NOTIFY_H_ -#define _PURPLE_NOTIFY_H_ - #include <stdlib.h> #include <glib-object.h> #include <glib.h>
--- a/libpurple/ntlm.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/ntlm.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_NTLM_H +#define _PURPLE_NTLM_H /** * SECTION:ntlm * @section_id: libpurple-ntlm @@ -26,9 +29,6 @@ * @title: NTLM Authentication */ -#ifndef _PURPLE_NTLM_H -#define _PURPLE_NTLM_H - G_BEGIN_DECLS /**
--- a/libpurple/pluginpref.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/pluginpref.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_PLUGINPREF_H_ +#define _PURPLE_PLUGINPREF_H_ /** * SECTION:pluginpref * @section_id: libpurple-pluginpref @@ -26,9 +29,6 @@ * @title: Plugin Preferences Frontend */ -#ifndef _PURPLE_PLUGINPREF_H_ -#define _PURPLE_PLUGINPREF_H_ - typedef struct _PurplePluginPrefFrame PurplePluginPrefFrame; typedef struct _PurplePluginPref PurplePluginPref;
--- a/libpurple/plugins.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/plugins.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PLUGINS_H_ +#define _PURPLE_PLUGINS_H_ /** * SECTION:plugins * @section_id: libpurple-plugins @@ -28,9 +31,6 @@ * <link linkend="chapter-plugin-i18n">Third Party Plugin Translation</link> */ -#ifndef _PURPLE_PLUGINS_H_ -#define _PURPLE_PLUGINS_H_ - #ifdef PURPLE_PLUGINS #include <gplugin.h> #include <gplugin-native.h>
--- a/libpurple/pounce.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/pounce.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_POUNCE_H_ +#define _PURPLE_POUNCE_H_ /** * SECTION:pounce * @section_id: libpurple-pounce @@ -25,9 +28,6 @@ * @title: Buddy Pounce API */ -#ifndef _PURPLE_POUNCE_H_ -#define _PURPLE_POUNCE_H_ - typedef struct _PurplePounce PurplePounce; #include <glib.h>
--- a/libpurple/prefs.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/prefs.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_PREFS_H_ +#define _PURPLE_PREFS_H_ /** * SECTION:prefs * @section_id: libpurple-prefs @@ -26,9 +29,6 @@ * @title: Preferences API */ -#ifndef _PURPLE_PREFS_H_ -#define _PURPLE_PREFS_H_ - #include <glib.h> /**
--- a/libpurple/presence.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/presence.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PRESENCE_H_ +#define _PURPLE_PRESENCE_H_ /** * SECTION:presence * @section_id: libpurple-presence @@ -29,9 +32,6 @@ * presence API. */ -#ifndef _PURPLE_PRESENCE_H_ -#define _PURPLE_PRESENCE_H_ - #define PURPLE_TYPE_PRESENCE (purple_presence_get_type()) #define PURPLE_PRESENCE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PRESENCE, PurplePresence)) #define PURPLE_PRESENCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PRESENCE, PurplePresenceClass))
--- a/libpurple/protocol.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/protocol.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PROTOCOL_H_ +#define _PURPLE_PROTOCOL_H_ /** * SECTION:protocol * @section_id: libpurple-protocol @@ -25,9 +28,6 @@ * @title: Protocol Object and Interfaces */ -#ifndef _PURPLE_PROTOCOL_H_ -#define _PURPLE_PROTOCOL_H_ - #define PURPLE_TYPE_PROTOCOL (purple_protocol_get_type()) #define PURPLE_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PROTOCOL, PurpleProtocol)) #define PURPLE_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PROTOCOL, PurpleProtocolClass))
--- a/libpurple/protocols.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/protocols.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PROTOCOLS_H_ +#define _PURPLE_PROTOCOLS_H_ /** * SECTION:protocols * @section_id: libpurple-protocols @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-protocol">Protocol signals</link> */ -#ifndef _PURPLE_PROTOCOLS_H_ -#define _PURPLE_PROTOCOLS_H_ - #define PURPLE_PROTOCOLS_DOMAIN (g_quark_from_static_string("protocols")) #define PURPLE_TYPE_PROTOCOL_ACTION (purple_protocol_action_get_type())
--- a/libpurple/protocols/gg/purplew.c Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/protocols/gg/purplew.c Fri Feb 07 21:49:22 2014 +0530 @@ -39,8 +39,8 @@ { if (purple_debug_is_verbose()) { purple_debug_misc("gg", "ggp_purplew_http_input_add: " - "[req=%x, fd=%d, cond=%d]\n", - (unsigned int)http_req, http_req->fd, http_req->check); + "[req=%p, fd=%d, cond=%d]\n", + http_req, http_req->fd, http_req->check); } return purple_input_add(http_req->fd, ggp_tcpsocket_inputcond_gg_to_purple(http_req->check),
--- a/libpurple/proxy.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/proxy.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PROXY_H_ +#define _PURPLE_PROXY_H_ /** * SECTION:proxy * @section_id: libpurple-proxy @@ -25,9 +28,6 @@ * @title: Proxy API */ -#ifndef _PURPLE_PROXY_H_ -#define _PURPLE_PROXY_H_ - #include <glib.h> #include "eventloop.h"
--- a/libpurple/purple-socket.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/purple-socket.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SOCKET_H_ +#define _PURPLE_SOCKET_H_ /** * SECTION:purple-socket * @section_id: libpurple-purple-socket @@ -25,9 +28,6 @@ * @title: Generic Sockets */ -#ifndef _PURPLE_SOCKET_H_ -#define _PURPLE_SOCKET_H_ - #include "connection.h" /**
--- a/libpurple/purple.h.in Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/purple.h.in Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_PURPLE_H_ +#define _PURPLE_PURPLE_H_ /** * SECTION:purple * @section_id: libpurple-purple @@ -30,9 +33,6 @@ * include any other libpurple files. */ -#ifndef _PURPLE_PURPLE_H_ -#define _PURPLE_PURPLE_H_ - #include <glib.h> #ifdef HAVE_CONFIG_H
--- a/libpurple/request-datasheet.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/request-datasheet.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_REQUEST_DATA_H_ +#define _PURPLE_REQUEST_DATA_H_ /** * SECTION:request-datasheet * @section_id: libpurple-request-datasheet @@ -25,9 +28,6 @@ * @title: Request Datasheet API */ -#ifndef _PURPLE_REQUEST_DATA_H_ -#define _PURPLE_REQUEST_DATA_H_ - #include <glib.h> typedef struct _PurpleRequestDatasheet PurpleRequestDatasheet;
--- a/libpurple/request.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/request.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_REQUEST_H_ +#define _PURPLE_REQUEST_H_ /** * SECTION:request * @section_id: libpurple-request @@ -25,9 +28,6 @@ * @title: Request API */ -#ifndef _PURPLE_REQUEST_H_ -#define _PURPLE_REQUEST_H_ - #include <stdlib.h> #include <glib-object.h> #include <glib.h>
--- a/libpurple/roomlist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/roomlist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_ROOMLIST_H_ +#define _PURPLE_ROOMLIST_H_ /** * SECTION:roomlist * @section_id: libpurple-roomlist @@ -25,9 +28,6 @@ * @title: Room List API */ -#ifndef _PURPLE_ROOMLIST_H_ -#define _PURPLE_ROOMLIST_H_ - #define PURPLE_TYPE_ROOMLIST (purple_roomlist_get_type()) #define PURPLE_ROOMLIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_ROOMLIST, PurpleRoomlist)) #define PURPLE_ROOMLIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_ROOMLIST, PurpleRoomlistClass))
--- a/libpurple/savedstatuses.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/savedstatuses.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SAVEDSTATUSES_H_ +#define _PURPLE_SAVEDSTATUSES_H_ /** * SECTION:savedstatuses * @section_id: libpurple-savedstatuses @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-savedstatus">Saved Status signals</link> */ -#ifndef _PURPLE_SAVEDSTATUSES_H_ -#define _PURPLE_SAVEDSTATUSES_H_ - #define PURPLE_TYPE_SAVEDSTATUS (purple_savedstatus_get_type()) /**
--- a/libpurple/server.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/server.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SERVER_H_ +#define _PURPLE_SERVER_H_ /** * SECTION:server * @section_id: libpurple-server @@ -25,9 +28,6 @@ * @title: Server API */ -#ifndef _PURPLE_SERVER_H_ -#define _PURPLE_SERVER_H_ - #include "accounts.h" #include "conversations.h" #include "protocols.h"
--- a/libpurple/signals.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/signals.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SIGNALS_H_ +#define _PURPLE_SIGNALS_H_ /** * SECTION:signals * @section_id: libpurple-signals @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-tut-signals">Signals tutorial</link> */ -#ifndef _PURPLE_SIGNALS_H_ -#define _PURPLE_SIGNALS_H_ - #include <glib.h> #include <glib-object.h>
--- a/libpurple/smiley.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/smiley.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_SMILEY_H_ +#define _PURPLE_SMILEY_H_ /** * SECTION:smiley * @section_id: libpurple-smiley @@ -26,9 +29,6 @@ * @title: Smiley API */ -#ifndef _PURPLE_SMILEY_H_ -#define _PURPLE_SMILEY_H_ - #include <glib-object.h> #include "imgstore.h"
--- a/libpurple/sound-theme-loader.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/sound-theme-loader.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_SOUND_THEME_LOADER_H +#define PURPLE_SOUND_THEME_LOADER_H /** * SECTION:sound-theme-loader * @section_id: libpurple-sound-theme-loader @@ -25,9 +28,6 @@ * @title: Sound Theme Loader Class */ -#ifndef PURPLE_SOUND_THEME_LOADER_H -#define PURPLE_SOUND_THEME_LOADER_H - #include <glib.h> #include <glib-object.h> #include "theme-loader.h"
--- a/libpurple/sound-theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/sound-theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_SOUND_THEME_H +#define PURPLE_SOUND_THEME_H /** * SECTION:sound-theme * @section_id: libpurple-sound-theme @@ -25,9 +28,6 @@ * @title: Sound Theme Abstact Class */ -#ifndef PURPLE_SOUND_THEME_H -#define PURPLE_SOUND_THEME_H - #include <glib.h> #include <glib-object.h> #include "theme.h"
--- a/libpurple/sound.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/sound.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SOUND_H_ +#define _PURPLE_SOUND_H_ /** * SECTION:sound * @section_id: libpurple-sound @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-sound">Sound signals</link> */ -#ifndef _PURPLE_SOUND_H_ -#define _PURPLE_SOUND_H_ - #include "account.h" /**************************************************************************/
--- a/libpurple/sslconn.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/sslconn.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_SSLCONN_H_ +#define _PURPLE_SSLCONN_H_ /** * SECTION:sslconn * @section_id: libpurple-sslconn @@ -25,9 +28,6 @@ * @title: SSL API */ -#ifndef _PURPLE_SSLCONN_H_ -#define _PURPLE_SSLCONN_H_ - /** * PurpleSslErrorType: *
--- a/libpurple/status.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/status.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_STATUS_H_ +#define _PURPLE_STATUS_H_ /** * SECTION:status * @section_id: libpurple-status @@ -26,9 +29,6 @@ * @title: Status Object API */ -#ifndef _PURPLE_STATUS_H_ -#define _PURPLE_STATUS_H_ - #define PURPLE_TYPE_STATUS (purple_status_get_type()) #define PURPLE_STATUS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_STATUS, PurpleStatus)) #define PURPLE_STATUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_STATUS, PurpleStatusClass))
--- a/libpurple/stringref.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/stringref.h Fri Feb 07 21:49:22 2014 +0530 @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PURPLE_STRINGREF_H_ +#define _PURPLE_STRINGREF_H_ /** * SECTION:stringref * @section_id: libpurple-stringref @@ -28,9 +31,6 @@ * @title: Reference-counted Immutable Strings */ -#ifndef _PURPLE_STRINGREF_H_ -#define _PURPLE_STRINGREF_H_ - typedef struct _PurpleStringref PurpleStringref; G_BEGIN_DECLS
--- a/libpurple/stun.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/stun.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_STUN_H_ +#define _PURPLE_STUN_H_ /** * SECTION:stun * @section_id: libpurple-stun @@ -25,9 +28,6 @@ * @title: STUN API */ -#ifndef _PURPLE_STUN_H_ -#define _PURPLE_STUN_H_ - /**************************************************************************/ /* STUN API */ /**************************************************************************/
--- a/libpurple/theme-loader.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/theme-loader.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_THEME_LOADER_H +#define PURPLE_THEME_LOADER_H /** * SECTION:theme-loader * @section_id: libpurple-theme-loader @@ -25,9 +28,6 @@ * @title: Theme Loader Abstact Class */ -#ifndef PURPLE_THEME_LOADER_H -#define PURPLE_THEME_LOADER_H - #include <glib.h> #include <glib-object.h> #include "theme.h"
--- a/libpurple/theme-manager.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/theme-manager.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_THEME_MANAGER_H +#define PURPLE_THEME_MANAGER_H /** * SECTION:theme-manager * @section_id: libpurple-theme-manager @@ -26,9 +29,6 @@ * @title: Theme Manager API */ -#ifndef PURPLE_THEME_MANAGER_H -#define PURPLE_THEME_MANAGER_H - #include <glib-object.h> #include <glib.h> #include "theme.h"
--- a/libpurple/theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PURPLE_THEME_H +#define PURPLE_THEME_H /** * SECTION:theme * @section_id: libpurple-theme @@ -25,9 +28,6 @@ * @title: Theme Abstact Class */ -#ifndef PURPLE_THEME_H -#define PURPLE_THEME_H - #include <glib.h> #include <glib-object.h> #include "imgstore.h"
--- a/libpurple/upnp.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/upnp.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_UPNP_H_ +#define _PURPLE_UPNP_H_ /** * SECTION:upnp * @section_id: libpurple-upnp @@ -25,9 +28,6 @@ * @title: Universal Plug N Play API */ -#ifndef _PURPLE_UPNP_H_ -#define _PURPLE_UPNP_H_ - typedef struct _UPnPMappingAddRemove UPnPMappingAddRemove; G_BEGIN_DECLS
--- a/libpurple/util.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/util.h Fri Feb 07 21:49:22 2014 +0530 @@ -21,6 +21,9 @@ * TODO Rename the functions so that they live somewhere in the purple * namespace. */ + +#ifndef _PURPLE_UTIL_H_ +#define _PURPLE_UTIL_H_ /** * SECTION:util * @section_id: libpurple-util @@ -28,9 +31,6 @@ * @title: Utility Functions */ -#ifndef _PURPLE_UTIL_H_ -#define _PURPLE_UTIL_H_ - #include <stdio.h> /**
--- a/libpurple/version.h.in Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/version.h.in Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_VERSION_H_ +#define _PURPLE_VERSION_H_ /** * SECTION:version * @section_id: libpurple-version @@ -26,9 +29,6 @@ * @title: Purple Versioning */ -#ifndef _PURPLE_VERSION_H_ -#define _PURPLE_VERSION_H_ - /** * PURPLE_MAJOR_VERSION: *
--- a/libpurple/whiteboard.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/whiteboard.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_WHITEBOARD_H_ +#define _PURPLE_WHITEBOARD_H_ /** * SECTION:whiteboard * @section_id: libpurple-whiteboard @@ -25,9 +28,6 @@ * @title: Whiteboard Object */ -#ifndef _PURPLE_WHITEBOARD_H_ -#define _PURPLE_WHITEBOARD_H_ - #define PURPLE_TYPE_WHITEBOARD (purple_whiteboard_get_type()) #define PURPLE_WHITEBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_WHITEBOARD, PurpleWhiteboard)) #define PURPLE_WHITEBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_WHITEBOARD, PurpleWhiteboardClass))
--- a/libpurple/xfer.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/xfer.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_XFER_H_ +#define _PURPLE_XFER_H_ /** * SECTION:xfer * @section_id: libpurple-xfer @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-xfer">File Transfer signals</link> */ -#ifndef _PURPLE_XFER_H_ -#define _PURPLE_XFER_H_ - #define PURPLE_TYPE_XFER (purple_xfer_get_type()) #define PURPLE_XFER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_XFER, PurpleXfer)) #define PURPLE_XFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_XFER, PurpleXferClass))
--- a/libpurple/xmlnode.h Fri Feb 07 18:22:36 2014 +0530 +++ b/libpurple/xmlnode.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PURPLE_XMLNODE_H_ +#define _PURPLE_XMLNODE_H_ /** * SECTION:xmlnode * @section_id: libpurple-xmlnode @@ -25,9 +28,6 @@ * @title: XML DOM functions */ -#ifndef _PURPLE_XMLNODE_H_ -#define _PURPLE_XMLNODE_H_ - #include <glib.h> #include <glib-object.h>
--- a/pidgin/gtk3compat.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtk3compat.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINGTK3COMPAT_H_ +#define _PIDGINGTK3COMPAT_H_ /* * SECTION:gtk3compat * @section_id: pidgin-gtk3compat @@ -28,9 +31,6 @@ * Also, any public API should not depend on this file. */ -#ifndef _PIDGINGTK3COMPAT_H_ -#define _PIDGINGTK3COMPAT_H_ - #if !GTK_CHECK_VERSION(3,2,0) #define GTK_FONT_CHOOSER GTK_FONT_SELECTION_DIALOG
--- a/pidgin/gtkaccount.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkaccount.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINACCOUNT_H_ +#define _PIDGINACCOUNT_H_ /** * SECTION:gtkaccount * @section_id: pidgin-gtkaccount @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-gtkaccount">Account signals</link> */ -#ifndef _PIDGINACCOUNT_H_ -#define _PIDGINACCOUNT_H_ - #include "accounts.h" typedef enum
--- a/pidgin/gtkblist-theme-loader.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkblist-theme-loader.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_BLIST_THEME_LOADER_H +#define PIDGIN_BLIST_THEME_LOADER_H /** * SECTION:gtkblist-theme-loader * @section_id: pidgin-gtkblist-theme-loader @@ -25,9 +28,6 @@ * @title: Buddy List Theme Loader Class */ -#ifndef PIDGIN_BLIST_THEME_LOADER_H -#define PIDGIN_BLIST_THEME_LOADER_H - #include <glib.h> #include <glib-object.h> #include "theme-loader.h"
--- a/pidgin/gtkblist-theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkblist-theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_BLIST_THEME_H +#define PIDGIN_BLIST_THEME_H /** * SECTION:gtkblist-theme * @section_id: pidgin-gtkblist-theme @@ -25,9 +28,6 @@ * @title: Buddy List Theme API */ -#ifndef PIDGIN_BLIST_THEME_H -#define PIDGIN_BLIST_THEME_H - #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h>
--- a/pidgin/gtkblist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkblist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINBLIST_H_ +#define _PIDGINBLIST_H_ /** * SECTION:gtkblist * @section_id: pidgin-gtkblist @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-gtkblist">Buddy List signals</link> */ -#ifndef _PIDGINBLIST_H_ -#define _PIDGINBLIST_H_ - typedef struct _PidginBuddyList PidginBuddyList; enum {
--- a/pidgin/gtkcellrendererexpander.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkcellrendererexpander.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGINCELLRENDEREREXPANDER_H_ +#define _PIDGINCELLRENDEREREXPANDER_H_ /** * SECTION:gtkcellrendererexpander * @section_id: pidgin-gtkcellrendererexpander @@ -25,9 +28,6 @@ * @title: Cell Renderer Expander */ -#ifndef _PIDGINCELLRENDEREREXPANDER_H_ -#define _PIDGINCELLRENDEREREXPANDER_H_ - #include <gtk/gtk.h> #define PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER (pidgin_cell_renderer_expander_get_type())
--- a/pidgin/gtkcertmgr.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkcertmgr.h Fri Feb 07 21:49:22 2014 +0530 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGINCERTMGR_H_ +#define _PIDGINCERTMGR_H_ /** * SECTION:gtkcertmgr * @section_id: pidgin-gtkcertmgr @@ -27,9 +30,6 @@ * @title: Certificate Manager API */ -#ifndef _PIDGINCERTMGR_H_ -#define _PIDGINCERTMGR_H_ - /************************************************************************** * Structures * **************************************************************************/
--- a/pidgin/gtkconn.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkconn.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINCONN_H_ +#define _PIDGINCONN_H_ /** * SECTION:gtkconn * @section_id: pidgin-gtkconn @@ -25,9 +28,6 @@ * @title: Connection API */ -#ifndef _PIDGINCONN_H_ -#define _PIDGINCONN_H_ - G_BEGIN_DECLS /**************************************************************************/
--- a/pidgin/gtkconv-theme-loader.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkconv-theme-loader.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_CONV_THEME_LOADER_H +#define PIDGIN_CONV_THEME_LOADER_H /** * SECTION:gtkconv-theme-loader * @section_id: pidgin-gtkconv-theme-loader @@ -25,9 +28,6 @@ * @title: Conversation Theme Loader Class */ -#ifndef PIDGIN_CONV_THEME_LOADER_H -#define PIDGIN_CONV_THEME_LOADER_H - #include <glib.h> #include <glib-object.h> #include "theme-loader.h"
--- a/pidgin/gtkconv-theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkconv-theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_CONV_THEME_H +#define PIDGIN_CONV_THEME_H /** * SECTION:gtkconv-theme * @section_id: pidgin-gtkconv-theme @@ -25,9 +28,6 @@ * @title: Conversation Theme Class */ -#ifndef PIDGIN_CONV_THEME_H -#define PIDGIN_CONV_THEME_H - #include <glib.h> #include <glib-object.h> #include "conversation.h"
--- a/pidgin/gtkconv.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkconv.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_CONVERSATION_H_ +#define _PIDGIN_CONVERSATION_H_ /** * SECTION:gtkconv * @section_id: pidgin-gtkconv @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-gtkconv">Conversation signals</link> */ -#ifndef _PIDGIN_CONVERSATION_H_ -#define _PIDGIN_CONVERSATION_H_ - typedef struct _PidginImPane PidginImPane; typedef struct _PidginChatPane PidginChatPane; typedef struct _PidginConversation PidginConversation;
--- a/pidgin/gtkconvwin.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkconvwin.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_CONVERSATION_WINDOW_H_ +#define _PIDGIN_CONVERSATION_WINDOW_H_ /** * SECTION:gtkconvwin * @section_id: pidgin-gtkconvwin @@ -25,9 +28,6 @@ * @title: Conversation Window API */ -#ifndef _PIDGIN_CONVERSATION_WINDOW_H_ -#define _PIDGIN_CONVERSATION_WINDOW_H_ - typedef struct _PidginWindowMenu PidginWindowMenu; typedef struct _PidginWindow PidginWindow;
--- a/pidgin/gtkdebug.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkdebug.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINDEBUG_H_ +#define _PIDGINDEBUG_H_ /** * SECTION:gtkdebug * @section_id: pidgin-gtkdebug @@ -25,9 +28,6 @@ * @title: Debug API */ -#ifndef _PIDGINDEBUG_H_ -#define _PIDGINDEBUG_H_ - #include "debug.h" G_BEGIN_DECLS
--- a/pidgin/gtkdialogs.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkdialogs.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINDIALOGS_H_ +#define _PIDGINDIALOGS_H_ /** * SECTION:gtkdialogs * @section_id: pidgin-gtkdialogs @@ -25,9 +28,6 @@ * @title: Pidgin Dialogs */ -#ifndef _PIDGINDIALOGS_H_ -#define _PIDGINDIALOGS_H_ - #include "pidgin.h" #include "account.h"
--- a/pidgin/gtkdnd-hints.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkdnd-hints.h Fri Feb 07 21:49:22 2014 +0530 @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ + +#ifndef _PIDGIN_DND_HINTS_H_ +#define _PIDGIN_DND_HINTS_H_ /** * SECTION:gtkdnd-hints * @section_id: pidgin-gtkdnd-hints @@ -23,9 +26,6 @@ * @title: Drag-and-Drop Arrow Hints */ -#ifndef _PIDGIN_DND_HINTS_H_ -#define _PIDGIN_DND_HINTS_H_ - #include <glib.h> #include <gtk/gtk.h>
--- a/pidgin/gtkdocklet.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkdocklet.h Fri Feb 07 21:49:22 2014 +0530 @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02111-1301, USA. */ + +#ifndef _GTKDOCKLET_H_ +#define _GTKDOCKLET_H_ /** * SECTION:gtkdocklet * @section_id: pidgin-gtkdocklet @@ -30,9 +33,6 @@ * This file provides the System tray icon (aka docklet) implementation. */ -#ifndef _GTKDOCKLET_H_ -#define _GTKDOCKLET_H_ - G_BEGIN_DECLS typedef enum
--- a/pidgin/gtkeventloop.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkeventloop.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINEVENTLOOP_H_ +#define _PIDGINEVENTLOOP_H_ /** * SECTION:gtkeventloop * @section_id: pidgin-gtkeventloop @@ -25,9 +28,6 @@ * @title: Event Loop Implementation */ -#ifndef _PIDGINEVENTLOOP_H_ -#define _PIDGINEVENTLOOP_H_ - #include "eventloop.h" G_BEGIN_DECLS
--- a/pidgin/gtkicon-theme-loader.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkicon-theme-loader.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_ICON_THEME_LOADER_H +#define PIDGIN_ICON_THEME_LOADER_H /** * SECTION:gtkicon-theme-loader * @section_id: pidgin-gtkicon-theme-loader @@ -25,9 +28,6 @@ * @title: Pidgin Icon Theme Loader Class */ -#ifndef PIDGIN_ICON_THEME_LOADER_H -#define PIDGIN_ICON_THEME_LOADER_H - #include <glib.h> #include <glib-object.h> #include "theme-loader.h"
--- a/pidgin/gtkicon-theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkicon-theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_ICON_THEME_H +#define PIDGIN_ICON_THEME_H /** * SECTION:gtkicon-theme * @section_id: pidgin-gtkicon-theme @@ -25,9 +28,6 @@ * @title: Icon Theme Class */ -#ifndef PIDGIN_ICON_THEME_H -#define PIDGIN_ICON_THEME_H - #include <glib.h> #include <glib-object.h> #include "theme.h"
--- a/pidgin/gtkidle.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkidle.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_IDLE_H_ +#define _PIDGIN_IDLE_H_ /** * SECTION:gtkidle * @section_id: pidgin-gtkidle @@ -25,9 +28,6 @@ * @title: Idle API */ -#ifndef _PIDGIN_IDLE_H_ -#define _PIDGIN_IDLE_H_ - #include "idle.h" G_BEGIN_DECLS
--- a/pidgin/gtkinternal.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkinternal.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_INTERNAL_H_ +#define _PIDGIN_INTERNAL_H_ /* * SECTION:gtkinternal * @section_id: pidgin-gtkinternal @@ -25,9 +28,6 @@ * @title: Internal Definitions and Includes */ -#ifndef _PIDGIN_INTERNAL_H_ -#define _PIDGIN_INTERNAL_H_ - G_BEGIN_DECLS PurpleStoredImage *
--- a/pidgin/gtklog.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtklog.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINLOG_H_ +#define _PIDGINLOG_H_ /** * SECTION:gtklog * @section_id: pidgin-gtklog @@ -26,9 +29,6 @@ * @see_also: <link linkend="chapter-signals-gtklog">Log signals</link> */ -#ifndef _PIDGINLOG_H_ -#define _PIDGINLOG_H_ - #include "pidgin.h" #include "log.h"
--- a/pidgin/gtkmedia.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkmedia.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + +#ifndef __GTKMEDIA_H_ +#define __GTKMEDIA_H_ /** * SECTION:gtkmedia * @section_id: pidgin-gtkmedia @@ -25,9 +28,6 @@ * @title: Media API */ -#ifndef __GTKMEDIA_H_ -#define __GTKMEDIA_H_ - G_BEGIN_DECLS void pidgin_medias_init(void);
--- a/pidgin/gtkmenutray.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkmenutray.h Fri Feb 07 21:49:22 2014 +0530 @@ -16,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_MENU_TRAY_H +#define PIDGIN_MENU_TRAY_H /** * SECTION:gtkmenutray * @section_id: pidgin-gtkmenutray @@ -23,9 +26,6 @@ * @title: Tray Menu Item */ -#ifndef PIDGIN_MENU_TRAY_H -#define PIDGIN_MENU_TRAY_H - #include <gtk/gtk.h> #define PIDGIN_TYPE_MENU_TRAY (pidgin_menu_tray_get_type())
--- a/pidgin/gtknickcolors.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtknickcolors.h Fri Feb 07 21:49:22 2014 +0530 @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINNICKCOLORS_H_ +#define _PIDGINNICKCOLORS_H_ /** * SECTION:gtknickcolors * @section_id: pidgin-gtknickcolors @@ -24,9 +27,6 @@ * @title: Conversation Nick Colors */ -#ifndef _PIDGINNICKCOLORS_H_ -#define _PIDGINNICKCOLORS_H_ - static const GdkColor nick_seed_colors[] = { {0, 64764, 59881, 20303}, /* Butter #1 */ {0, 60909, 54484, 0}, /* Butter #2 */
--- a/pidgin/gtknotify.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtknotify.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINNOTIFY_H_ +#define _PIDGINNOTIFY_H_ /** * SECTION:gtknotify * @section_id: pidgin-gtknotify @@ -25,9 +28,6 @@ * @title: Notification API */ -#ifndef _PIDGINNOTIFY_H_ -#define _PIDGINNOTIFY_H_ - #include "notify.h" #include "pounce.h"
--- a/pidgin/gtkplugin.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkplugin.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINPLUGIN_H_ +#define _PIDGINPLUGIN_H_ /** * SECTION:gtkplugin * @section_id: pidgin-gtkplugin @@ -25,9 +28,6 @@ * @title: Plugin API */ -#ifndef _PIDGINPLUGIN_H_ -#define _PIDGINPLUGIN_H_ - #include "pidgin.h" #include "plugins.h"
--- a/pidgin/gtkpluginpref.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkpluginpref.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGINPLUGINPREF_H_ +#define _PIDGINPLUGINPREF_H_ /** * SECTION:gtkpluginpref * @section_id: pidgin-gtkpluginpref @@ -26,9 +29,6 @@ * @title: Plugin Preferences */ -#ifndef _PIDGINPLUGINPREF_H_ -#define _PIDGINPLUGINPREF_H_ - #include "pluginpref.h" #include "pidgin.h"
--- a/pidgin/gtkpounce.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkpounce.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINPOUNCE_H_ +#define _PIDGINPOUNCE_H_ /** * SECTION:gtkpounce * @section_id: pidgin-gtkpounce @@ -25,9 +28,6 @@ * @title: Buddy Pounce API */ -#ifndef _PIDGINPOUNCE_H_ -#define _PIDGINPOUNCE_H_ - #include "pounce.h" G_BEGIN_DECLS
--- a/pidgin/gtkprefs.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkprefs.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGINPREFS_H_ +#define _PIDGINPREFS_H_ /** * SECTION:gtkprefs * @section_id: pidgin-gtkprefs @@ -26,9 +29,6 @@ * @title: Preferences */ -#ifndef _PIDGINPREFS_H_ -#define _PIDGINPREFS_H_ - #include "prefs.h" G_BEGIN_DECLS
--- a/pidgin/gtkprivacy.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkprivacy.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINPRIVACY_H_ +#define _PIDGINPRIVACY_H_ /** * SECTION:gtkprivacy * @section_id: pidgin-gtkprivacy @@ -25,9 +28,6 @@ * @title: Privacy UI */ -#ifndef _PIDGINPRIVACY_H_ -#define _PIDGINPRIVACY_H_ - #include "account.h" G_BEGIN_DECLS
--- a/pidgin/gtkrequest.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkrequest.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINREQUEST_H_ +#define _PIDGINREQUEST_H_ /** * SECTION:gtkrequest * @section_id: pidgin-gtkrequest @@ -25,9 +28,6 @@ * @title: Request API */ -#ifndef _PIDGINREQUEST_H_ -#define _PIDGINREQUEST_H_ - #include "request.h" G_BEGIN_DECLS
--- a/pidgin/gtkroomlist.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkroomlist.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINROOMLIST_H_ +#define _PIDGINROOMLIST_H_ /** * SECTION:gtkroomlist * @section_id: pidgin-gtkroomlist @@ -25,9 +28,6 @@ * @title: Room List UI */ -#ifndef _PIDGINROOMLIST_H_ -#define _PIDGINROOMLIST_H_ - #include "roomlist.h" G_BEGIN_DECLS
--- a/pidgin/gtksavedstatuses.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksavedstatuses.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINSAVEDSTATUSES_H_ +#define _PIDGINSAVEDSTATUSES_H_ /** * SECTION:gtksavedstatuses * @section_id: pidgin-gtksavedstatuses @@ -25,9 +28,6 @@ * @title: Saved Status Editor UI */ -#ifndef _PIDGINSAVEDSTATUSES_H_ -#define _PIDGINSAVEDSTATUSES_H_ - #include "savedstatuses.h" #include "status.h"
--- a/pidgin/gtkscrollbook.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkscrollbook.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef __PIDGIN_SCROLL_BOOK_H__ +#define __PIDGIN_SCROLL_BOOK_H__ /** * SECTION:gtkscrollbook * @section_id: pidgin-gtkscrollbook @@ -25,9 +28,6 @@ * @title: Scrolling Notebook Widget */ -#ifndef __PIDGIN_SCROLL_BOOK_H__ -#define __PIDGIN_SCROLL_BOOK_H__ - #include <gtk/gtk.h> G_BEGIN_DECLS
--- a/pidgin/gtksession.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksession.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINSESSION_H_ +#define _PIDGINSESSION_H_ /** * SECTION:gtksession * @section_id: pidgin-gtksession @@ -25,9 +28,6 @@ * @title: X Windows Session Management */ -#ifndef _PIDGINSESSION_H_ -#define _PIDGINSESSION_H_ - G_BEGIN_DECLS /**************************************************************************/
--- a/pidgin/gtksmiley.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksmiley.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_GTKSMILEY_H +#define PIDGIN_GTKSMILEY_H /** * SECTION:gtksmiley * @section_id: pidgin-gtksmiley @@ -25,9 +28,6 @@ * @title: Custom Smiley API */ -#ifndef PIDGIN_GTKSMILEY_H -#define PIDGIN_GTKSMILEY_H - #include "smiley.h" typedef struct _PidginSmiley PidginSmiley;
--- a/pidgin/gtksound.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksound.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINSOUND_H_ +#define _PIDGINSOUND_H_ /** * SECTION:gtksound * @section_id: pidgin-gtksound @@ -25,9 +28,6 @@ * @title: Sound API */ -#ifndef _PIDGINSOUND_H_ -#define _PIDGINSOUND_H_ - #include "sound.h" G_BEGIN_DECLS
--- a/pidgin/gtksourceiter.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksourceiter.h Fri Feb 07 21:49:22 2014 +0530 @@ -24,6 +24,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ + +#ifndef _PIDGINSOURCEITER_H_ +#define _PIDGINSOURCEITER_H_ /** * SECTION:gtksourceiter * @section_id: pidgin-gtksourceiter @@ -31,9 +34,6 @@ * @title: Source Iterator utilities */ -#ifndef _PIDGINSOURCEITER_H_ -#define _PIDGINSOURCEITER_H_ - #include <gtk/gtk.h> G_BEGIN_DECLS
--- a/pidgin/gtksourceundomanager.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtksourceundomanager.h Fri Feb 07 21:49:22 2014 +0530 @@ -22,6 +22,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02111-1301, USA. * * */ + +#ifndef __GTK_SOURCE_UNDO_MANAGER_H__ +#define __GTK_SOURCE_UNDO_MANAGER_H__ /** * SECTION:gtksourceundomanager * @section_id: pidgin-gtksourceundomanager @@ -29,9 +32,6 @@ * @title: Source Undo Manager */ -#ifndef __GTK_SOURCE_UNDO_MANAGER_H__ -#define __GTK_SOURCE_UNDO_MANAGER_H__ - #include <gtk/gtk.h> #define GTK_SOURCE_TYPE_UNDO_MANAGER (gtk_source_undo_manager_get_type())
--- a/pidgin/gtkstatus-icon-theme.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkstatus-icon-theme.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef PIDGIN_STATUS_ICON_THEME_H +#define PIDGIN_STATUS_ICON_THEME_H /** * SECTION:gtkstatus-icon-theme * @section_id: pidgin-gtkstatus-icon-theme @@ -25,9 +28,6 @@ * @title: Pidgin Icon Theme Class */ -#ifndef PIDGIN_STATUS_ICON_THEME_H -#define PIDGIN_STATUS_ICON_THEME_H - #include <glib-object.h> #include "gtkicon-theme.h"
--- a/pidgin/gtkstatusbox.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkstatusbox.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef __PIDGIN_STATUS_BOX_H__ +#define __PIDGIN_STATUS_BOX_H__ /** * SECTION:gtkstatusbox * @section_id: pidgin-gtkstatusbox @@ -25,9 +28,6 @@ * @title: Status Selection Widget */ -#ifndef __PIDGIN_STATUS_BOX_H__ -#define __PIDGIN_STATUS_BOX_H__ - #include <gtk/gtk.h> #include "gtkwebview.h" #include "account.h"
--- a/pidgin/gtkthemes.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkthemes.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINTHEMES_H_ +#define _PIDGINTHEMES_H_ /** * SECTION:gtkthemes * @section_id: pidgin-gtkthemes @@ -25,9 +28,6 @@ * @title: Smiley Theme API */ -#ifndef _PIDGINTHEMES_H_ -#define _PIDGINTHEMES_H_ - struct smiley_list { char *sml; GSList *smileys;
--- a/pidgin/gtkutils.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkutils.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINUTILS_H_ +#define _PIDGINUTILS_H_ /** * SECTION:gtkutils * @section_id: pidgin-gtkutils @@ -25,9 +28,6 @@ * @title: Utility functions */ -#ifndef _PIDGINUTILS_H_ -#define _PIDGINUTILS_H_ - #include "gtkconv.h" #include "pidgin.h" #include "protocol.h"
--- a/pidgin/gtkwebview.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkwebview.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGIN_WEBVIEW_H_ +#define _PIDGIN_WEBVIEW_H_ /** * SECTION:gtkwebview * @section_id: pidgin-gtkwebview @@ -28,9 +31,6 @@ * Wrapper over the Gtk WebKitWebView component. */ -#ifndef _PIDGIN_WEBVIEW_H_ -#define _PIDGIN_WEBVIEW_H_ - #include <glib.h> #include <gtk/gtk.h> #include <webkit/webkit.h>
--- a/pidgin/gtkwebviewtoolbar.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkwebviewtoolbar.h Fri Feb 07 21:49:22 2014 +0530 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGINWEBVIEWTOOLBAR_H_ +#define _PIDGINWEBVIEWTOOLBAR_H_ /** * SECTION:gtkwebviewtoolbar * @section_id: pidgin-gtkwebviewtoolbar @@ -27,9 +30,6 @@ * @title: WebView Toolbar */ -#ifndef _PIDGINWEBVIEWTOOLBAR_H_ -#define _PIDGINWEBVIEWTOOLBAR_H_ - #include <gtk/gtk.h> #include "gtkwebview.h"
--- a/pidgin/gtkwhiteboard.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkwhiteboard.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINWHITEBOARD_H_ +#define _PIDGINWHITEBOARD_H_ /** * SECTION:gtkwhiteboard * @section_id: pidgin-gtkwhiteboard @@ -25,9 +28,6 @@ * @title: Whiteboard Frontend */ -#ifndef _PIDGINWHITEBOARD_H_ -#define _PIDGINWHITEBOARD_H_ - #include "pidgin.h" #include "whiteboard.h"
--- a/pidgin/gtkxfer.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/gtkxfer.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGINXFER_H_ +#define _PIDGINXFER_H_ /** * SECTION:gtkxfer * @section_id: pidgin-gtkxfer @@ -25,9 +28,6 @@ * @title: File Transfer UI */ -#ifndef _PIDGINXFER_H_ -#define _PIDGINXFER_H_ - #include "xfer.h" /**
--- a/pidgin/minidialog.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/minidialog.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef __PIDGIN_MINI_DIALOG_H__ +#define __PIDGIN_MINI_DIALOG_H__ /** * SECTION:minidialog * @section_id: pidgin-minidialog @@ -25,9 +28,6 @@ * @title: Mini Dialog Widget */ -#ifndef __PIDGIN_MINI_DIALOG_H__ -#define __PIDGIN_MINI_DIALOG_H__ - #include <glib-object.h> #include <gtk/gtk.h>
--- a/pidgin/pidgin.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/pidgin.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* #warning ***pidgin*** */ + +#ifndef _PIDGIN_H_ +#define _PIDGIN_H_ /** * SECTION:pidgin * @section_id: pidgin-pidgin @@ -26,9 +29,6 @@ * @title: UI Definitions and Includes */ -#ifndef _PIDGIN_H_ -#define _PIDGIN_H_ - #include <gtk/gtk.h> #ifdef _WIN32
--- a/pidgin/pidginstock.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/pidginstock.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_STOCK_H_ +#define _PIDGIN_STOCK_H_ /** * SECTION:pidginstock * @section_id: pidgin-pidginstock @@ -28,9 +31,6 @@ #include <gtk/gtk.h> #include "gtkstatus-icon-theme.h" -#ifndef _PIDGIN_STOCK_H_ -#define _PIDGIN_STOCK_H_ - /**************************************************************************/ /* Stock images */ /**************************************************************************/
--- a/pidgin/pidgintooltip.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/pidgintooltip.h Fri Feb 07 21:49:22 2014 +0530 @@ -18,6 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#ifndef _PIDGIN_TOOLTIP_H_ +#define _PIDGIN_TOOLTIP_H_ /** * SECTION:pidgintooltip * @section_id: pidgin-pidgintooltip @@ -25,9 +28,6 @@ * @title: Pidgin Tooltip API */ -#ifndef _PIDGIN_TOOLTIP_H_ -#define _PIDGIN_TOOLTIP_H_ - #include <gtk/gtk.h> /**
--- a/pidgin/smileyparser.h Fri Feb 07 18:22:36 2014 +0530 +++ b/pidgin/smileyparser.h Fri Feb 07 21:49:22 2014 +0530 @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ + +#ifndef _PIDGIN_SMILEYPARSER_H_ +#define _PIDGIN_SMILEYPARSER_H_ /** * SECTION:smileyparser * @section_id: pidgin-smileyparser @@ -33,3 +36,4 @@ G_END_DECLS +#endif /* _PIDGIN_SMILEYPARSER_H_ */