Add G_BEGIN_DECLS and G_END_DECLS to public headers, some compilers require that.
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Sun, 17 Aug 2014 00:30:12 +0000 (03:30 +0300)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Sun, 17 Aug 2014 00:30:12 +0000 (03:30 +0300)
src/icon-grid.h
src/misc.h
src/panel.h
src/plugins/launchtaskbar.c

index 0f0a04c..8179918 100644 (file)
  */
 
 #ifndef __ICON_GRID_H__
-#define __ICON_GRID_H__
+#define __ICON_GRID_H__ 1
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 #define PANEL_TYPE_ICON_GRID               (panel_icon_grid_get_type())
 #define PANEL_ICON_GRID(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), \
                                             PANEL_TYPE_ICON_GRID, PanelIconGrid))
@@ -51,4 +53,6 @@ extern gint panel_icon_grid_get_child_position(PanelIconGrid * ig, GtkWidget * c
 extern void panel_icon_grid_reorder_child(PanelIconGrid * ig, GtkWidget * child, gint position);
                                                /* Reorder the position of a child in the icon grid */
 
+G_END_DECLS
+
 #endif
index f2ab4f4..f917e4c 100644 (file)
@@ -16,8 +16,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MISC_H
-#define MISC_H
+#ifndef __MISC_H__
+#define __MISC_H__ 1
 
 #include <X11/Xatom.h>
 #include <gtk/gtk.h>
@@ -28,6 +28,8 @@
 
 #include "panel.h"
 
+G_BEGIN_DECLS
+
 /* Decoded value of WM_STATE property. */
 typedef struct {
     unsigned int modal : 1;
@@ -97,4 +99,6 @@ extern GtkWidget *lxpanel_generic_config_dlg(const char *title, LXPanel *panel,
                                              GtkWidget *plugin,
                                              const char *name, ...);
 
+G_END_DECLS
+
 #endif
index 57c1021..1046eee 100644 (file)
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef PANEL_H
-#define PANEL_H
+#ifndef __PANEL_H__
+#define __PANEL_H__ 1
 
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 extern gchar *cprofile;
 
 extern Atom a_UTF8_STRING;
@@ -132,4 +134,6 @@ extern gboolean panel_is_dynamic(LXPanel *panel);
 extern GtkWidget *panel_box_new(LXPanel *panel, gboolean homogeneous, gint spacing);
 extern GtkWidget *panel_separator_new(LXPanel *panel);
 
+G_END_DECLS
+
 #endif
index da80e6c..55f57c4 100644 (file)
@@ -2787,7 +2787,6 @@ static void task_build_gui(LaunchTaskBarPlugin * tb, Task * tk)
 
     /* Add the box to the button. */
     gtk_container_add(GTK_CONTAINER(tk->button), container);
-//    gtk_widget_show(container);
     gtk_container_set_border_width(GTK_CONTAINER(tk->button), 0);
 
     /* Add the button to the taskbar. */