Ticket #29296: patch-use_extern.diff

libgtkpod/gtkpod_app_iface.c

@@ -695 +695 @@
     GtkPodAppInterface *gp_iface = GTKPOD_APP_GET_INTERFACE (gtkpod_app);
     return g_hash_table_get_keys(gp_iface->filetypes);
 }
+
+GtkPodApp *gtkpod_app;
+guint gtkpod_app_signals[LAST_SIGNAL];

libgtkpod/gtkpod_app_iface.h

@@ -80 +80 @@
 } CONF_STATE;
 
 /* predefined IDs for use with gtkpod_confirmation() */
-enum {
+typedef enum {
     CONF_ID_IPOD_DIR = 0,
     CONF_ID_GTKPOD_WARNING,
     CONF_ID_DANGLING0,
@@ -245 +245 @@
 FileType* gtkpod_get_filetype(gchar *name);
 GList *gtkpod_get_filetypes();
 
-GtkPodApp *gtkpod_app;
-guint gtkpod_app_signals[LAST_SIGNAL];
+extern GtkPodApp *gtkpod_app;
+extern guint gtkpod_app_signals[LAST_SIGNAL];
 
 #endif /* GTKPOD_APP_IFACE_H_ */

plugins/core_preferences/plugin.c

@@ -41 +41 @@
 #define PREFERENCE_ICON "core_prefs-gtkpod-category"
 #define PREFERENCE_ICON_STOCK_ID "core_prefs-preference-icon"
 
+CorePrefsPlugin *core_prefs_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 

plugins/core_preferences/plugin.h

@@ -61 +61 @@
     AnjutaPluginClass parent_class;
 };
 
-CorePrefsPlugin *core_prefs_plugin;
+extern CorePrefsPlugin *core_prefs_plugin;
 
 #endif /* PLUGIN_H_ */

plugins/details_editor/plugin.c

@@ -37 +37 @@
 #include "details.h"
 #include "details_editor_actions.h"
 
+DetailsEditorPlugin *details_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 

plugins/details_editor/plugin.h

@@ -52 +52 @@
     AnjutaPluginClass parent_class;
 };
 
-DetailsEditorPlugin *details_editor_plugin;
+extern DetailsEditorPlugin *details_editor_plugin;
 
 #endif /* PLUGIN_H_ */

plugins/info_display/plugin.c

@@ -37 +37 @@
 #include "info.h"
 #include "infoview.h"
 
+InfoDisplayPlugin *info_display_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 

plugins/info_display/plugin.h

@@ -50 +50 @@
     AnjutaPluginClass parent_class;
 };
 
-InfoDisplayPlugin *info_display_plugin;
+extern InfoDisplayPlugin *info_display_plugin;
 
 #endif /* PLUGIN_H_ */

plugins/photo_editor/plugin.c

@@ -38 +38 @@
 #include "photo_editor_actions.h"
 #include "plugin.h"
 
+PhotoEditorPlugin *photo_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 

plugins/photo_editor/plugin.h

@@ -59 +59 @@
     AnjutaPluginClass parent_class;
 };
 
-PhotoEditorPlugin *photo_editor_plugin;
+extern PhotoEditorPlugin *photo_editor_plugin;
 
 #endif /* PLUGIN_H_ */

plugins/repository_editor/plugin.c

@@ -37 +37 @@
 #include "repository.h"
 #include "repository_actions.h"
 
+RepositoryEditorPlugin *repository_editor_plugin;
+
 /* Parent class. Part of standard class definition */
 static gpointer parent_class;
 

plugins/repository_editor/plugin.h

@@ -51 +51 @@
     AnjutaPluginClass parent_class;
 };
 
-RepositoryEditorPlugin *repository_editor_plugin;
+extern RepositoryEditorPlugin *repository_editor_plugin;
 
 #endif /* PLUGIN_H_ */

plugins/sorttab_display/display_sorttabs.c

@@ -83 +83 @@
 
 GtkBuilder *cal_xml;
 
+GtkPaned *sorttab_parent;
+
 /* ---------------------------------------------------------------- */
 /*                                                                  */
 /* Section for filter tab display (callback)                        */

plugins/sorttab_display/display_sorttabs.h

@@ -119 +119 @@
 #define SP_SHIFT 9
 #define SP_MASK ((1<<SP_SHIFT)-1)
 
-GtkPaned *sorttab_parent;
+extern GtkPaned *sorttab_parent;
 
 void st_create_tabs(GtkPaned *parent, gchar *glade_path);
 void st_init(ST_CAT_item new_category, guint32 inst);