From eaa38a669d76bcbcc5aa4788d740b45760126507 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <le.businessman@gmail.com>
Date: Sun, 17 Feb 2013 12:42:24 -0500
Subject: [PATCH] gnome: remove G_BEGIN/END decls macros
Since the client is compiled with a C compiler, these served no purpose.
---
gnome/src/config/addressbook-config.h | 4 ----
gnome/src/config/hooks-config.h | 4 ----
gnome/src/config/shortcuts-config.h | 4 ----
gnome/src/config/utils.h | 4 ----
gnome/src/seekslider.h | 4 ----
gnome/src/sflnotify.h | 4 ----
gnome/src/sflphone_options.h | 2 --
gnome/src/uimanager.h | 4 ----
gnome/src/video/video_renderer.h | 4 ----
gnome/src/widget/minidialog.h | 4 ----
10 files changed, 38 deletions(-)
diff --git a/gnome/src/config/addressbook-config.h b/gnome/src/config/addressbook-config.h
index f6f430ee75..6d95cceff8 100644
--- a/gnome/src/config/addressbook-config.h
+++ b/gnome/src/config/addressbook-config.h
@@ -38,8 +38,6 @@
#include "actions.h"
#include "utils.h"
-G_BEGIN_DECLS
-
#define ADDRESSBOOK_ENABLE "ADDRESSBOOK_ENABLE"
#define ADDRESSBOOK_MAX_RESULTS "ADDRESSBOOK_MAX_RESULTS"
#define ADDRESSBOOK_DISPLAY_CONTACT_PHOTO "ADDRESSBOOK_DISPLAY_CONTACT_PHOTO"
@@ -64,6 +62,4 @@ addressbook_display (AddressBook_Config *settings, const gchar *field);
GtkWidget*
create_addressbook_settings();
-G_END_DECLS
-
#endif // _ADDRESS_BOOK_CONFIG
diff --git a/gnome/src/config/hooks-config.h b/gnome/src/config/hooks-config.h
index 023e123eb8..714dd256ba 100644
--- a/gnome/src/config/hooks-config.h
+++ b/gnome/src/config/hooks-config.h
@@ -37,8 +37,6 @@
#include "actions.h"
#include "utils.h"
-G_BEGIN_DECLS
-
#define DEFAULT_SIP_URL_FIELD "X-sflphone-url"
#define DEFAULT_URL_COMMAND "xdg-open \"%s\""
#define URLHOOK_COMMAND "URLHOOK_COMMAND"
@@ -67,6 +65,4 @@ void hooks_load_parameters (URLHook_Config** settings);
GtkWidget* create_hooks_settings(SFLPhoneClient *client);
-G_END_DECLS
-
#endif // _HOOKS_CONFIG
diff --git a/gnome/src/config/shortcuts-config.h b/gnome/src/config/shortcuts-config.h
index 78eb58db02..37fac1a626 100644
--- a/gnome/src/config/shortcuts-config.h
+++ b/gnome/src/config/shortcuts-config.h
@@ -37,8 +37,6 @@
#include "actions.h"
#include <utils.h>
-G_BEGIN_DECLS
-
enum {
ACTION = 0, MASK, VALUE, COLUMNS
};
@@ -46,6 +44,4 @@ enum {
GtkWidget*
create_shortcuts_settings ();
-G_END_DECLS
-
#endif // _SHORTCUTS_CONFIG
diff --git a/gnome/src/config/utils.h b/gnome/src/config/utils.h
index 15eb6915b4..e7aa8e0aba 100644
--- a/gnome/src/config/utils.h
+++ b/gnome/src/config/utils.h
@@ -33,12 +33,8 @@
#include <gtk/gtk.h>
-G_BEGIN_DECLS
-
GtkWidget *gnome_main_section_new(const gchar * const title);
void gnome_main_section_new_with_table (gchar *title, GtkWidget**, GtkWidget**, gint nb_col, gint nb_row);
GtkWidget *gnome_info_bar (gchar *message, GtkMessageType type);
-G_END_DECLS
-
#endif // _UTILS_
diff --git a/gnome/src/seekslider.h b/gnome/src/seekslider.h
index a3f30ecebf..3250846243 100644
--- a/gnome/src/seekslider.h
+++ b/gnome/src/seekslider.h
@@ -30,8 +30,6 @@
#include <gtk/gtk.h>
-G_BEGIN_DECLS
-
#define SFL_TYPE_SEEKSLIDER (sfl_seekslider_get_type ())
#define SFL_SEEKSLIDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SFL_TYPE_SEEKSLIDER, SFLSeekSlider))
#define SFL_SEEKSLIDER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SFL_TYPE_SEEKSLIDER, SFLSeekSliderClass))
@@ -72,6 +70,4 @@ void sfl_seekslider_set_display(SFLSeekSlider *seekslider, SFLSeekSliderDisplay
void sfl_seekslider_reset(SFLSeekSlider *seekslider);
-G_END_DECLS
-
#endif /* __RB_SEEKSLIDER_H */
diff --git a/gnome/src/sflnotify.h b/gnome/src/sflnotify.h
index b496e6cccf..bc8b6f9fa4 100644
--- a/gnome/src/sflnotify.h
+++ b/gnome/src/sflnotify.h
@@ -39,8 +39,6 @@
#include "calllist.h"
#include "sflphone_client.h"
-G_BEGIN_DECLS
-
/**
* Notify an incoming call
* A dialog box is attached to the status icon
@@ -100,6 +98,4 @@ void notify_zrtp_negotiation_failed(callable_obj_t* c, SFLPhoneClient *client);
*/
void notify_zrtp_not_supported(callable_obj_t* c, SFLPhoneClient *client);
-G_END_DECLS
-
#endif
diff --git a/gnome/src/sflphone_options.h b/gnome/src/sflphone_options.h
index 1e32cab372..a6cbe0028c 100644
--- a/gnome/src/sflphone_options.h
+++ b/gnome/src/sflphone_options.h
@@ -36,6 +36,4 @@
GOptionContext *
sflphone_options_get_context();
-G_END_DECLS
-
#endif /* SFLPHONE_OPTIONS_H_ */
diff --git a/gnome/src/uimanager.h b/gnome/src/uimanager.h
index 5f8aed1823..0a79679834 100644
--- a/gnome/src/uimanager.h
+++ b/gnome/src/uimanager.h
@@ -31,8 +31,6 @@
#ifndef UI_MANAGER_H
#define UI_MANAGER_H
-G_BEGIN_DECLS
-
#include "sflphone_client.h"
GtkWidget *historyButton_;
@@ -63,6 +61,4 @@ create_menus(GtkUIManager *ui_manager, SFLPhoneClient *client);
void
create_toolbar_actions(GtkUIManager *ui_manager, SFLPhoneClient *client);
-G_END_DECLS
-
#endif
diff --git a/gnome/src/video/video_renderer.h b/gnome/src/video/video_renderer.h
index 02ff0b562a..8ec33a9bda 100644
--- a/gnome/src/video/video_renderer.h
+++ b/gnome/src/video/video_renderer.h
@@ -34,8 +34,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
-G_BEGIN_DECLS
-
#define VIDEO_RENDERER_TYPE (video_renderer_get_type())
#define VIDEO_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), VIDEO_RENDERER_TYPE, VideoRenderer))
#define VIDEO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), VIDEO_RENDERER_TYPE, VideoRendererClass))
@@ -67,6 +65,4 @@ video_renderer_run(VideoRenderer *self);
void
video_renderer_stop(VideoRenderer *self);
-G_END_DECLS
-
#endif // __VIDEO_RENDERER_H__
diff --git a/gnome/src/widget/minidialog.h b/gnome/src/widget/minidialog.h
index 673841659e..4e70c6d917 100644
--- a/gnome/src/widget/minidialog.h
+++ b/gnome/src/widget/minidialog.h
@@ -29,8 +29,6 @@
#include <glib-object.h>
-G_BEGIN_DECLS
-
#define PIDGIN_TYPE_MINI_DIALOG pidgin_mini_dialog_get_type()
#define PIDGIN_MINI_DIALOG(obj) \
@@ -155,6 +153,4 @@ void pidgin_mini_dialog_add_button (PidginMiniDialog *mini_dialog,
*/
guint pidgin_mini_dialog_get_num_children (PidginMiniDialog *mini_dialog);
-G_END_DECLS
-
#endif /* __PIDGIN_MINI_DIALOG_H__ */
--
GitLab