summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2017-07-22 01:43:19 -0400
committerlukefromdc <[email protected]>2017-08-13 14:37:24 -0400
commit5c40325affbbfc73ec4f07f560fe4f8633a4a827 (patch)
tree9f55890e2ed5f3be22f884997dae0a44f233ea08
parent080ac0dad0198ec3be067e5f05300caa48054b51 (diff)
downloadmate-panel-5c40325affbbfc73ec4f07f560fe4f8633a4a827.tar.bz2
mate-panel-5c40325affbbfc73ec4f07f560fe4f8633a4a827.tar.xz
libmate-panel-applet: Only declare _panel_applet_shlib_factory() when needed
Stops segfault on adding, removing, adding fish again when built in-process. Based on https://github.com/GNOME/gnome-panel/commit/66602bab12f55e09b2205b493c7e0e5e9c560911 "This function only makes sense when PANEL_APPLET_IN_PROCESS_FACTORY is used."
-rw-r--r--libmate-panel-applet/mate-panel-applet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h
index fd299e51..396fc50f 100644
--- a/libmate-panel-applet/mate-panel-applet.h
+++ b/libmate-panel-applet/mate-panel-applet.h
@@ -113,7 +113,6 @@ void mate_panel_applet_setup_menu(MatePanelApplet* applet, const gchar* xml, Gtk
void mate_panel_applet_setup_menu_from_file(MatePanelApplet* applet, const gchar* filename, GtkActionGroup* action_group);
int mate_panel_applet_factory_main(const gchar* factory_factory_id,gboolean out_process, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer data);
-gboolean _mate_panel_applet_shlib_factory(void);
int mate_panel_applet_factory_setup_in_process (const gchar *factory_factory_id,
GType applet_type,
@@ -180,6 +179,7 @@ int main(int argc, char* argv[]) \
}
#define MATE_PANEL_APPLET_IN_PROCESS_FACTORY(factory_id, type, descr, callback, data) \
+gboolean _mate_panel_applet_shlib_factory (void); \
G_MODULE_EXPORT gint _mate_panel_applet_shlib_factory(void) \
{ \
_MATE_PANEL_APPLET_SETUP_GETTEXT(FALSE); \