summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2017-07-17 15:45:38 -0400
committerlukefromdc <[email protected]>2017-08-13 14:37:24 -0400
commit94d8d911c873fce175b808e64addc89823252ffb (patch)
tree1186fdf0978def4f20881ce8d4e5a807997281e5
parent50adc8501aa740b2bbcde50ce0adc780e79536aa (diff)
downloadmate-panel-94d8d911c873fce175b808e64addc89823252ffb.tar.bz2
mate-panel-94d8d911c873fce175b808e64addc89823252ffb.tar.xz
libmate-panel-applet: include dummy variable in factory for certian applets
Otherwise, some applets such as disk mounter, hardware monitor, cpufreq won't start. * Fixes all but invest, note that cpufreq needs to be rebuilt against this for the menu to work * Also fix two new build warnings
-rw-r--r--libmate-panel-applet/mate-panel-applet.c6
-rw-r--r--libmate-panel-applet/mate-panel-applet.h7
2 files changed, 8 insertions, 5 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index 25b21cbc..5a46080e 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -1556,9 +1556,9 @@ mate_panel_applet_change_background(MatePanelApplet *applet,
if (applet->priv->out_of_process)
window = gtk_widget_get_window (applet->priv->plug);
else
- window = gtk_widget_get_window (applet);
+ window = gtk_widget_get_window GTK_WIDGET((applet));
#else
- window = gtk_widget_get_window (applet);
+ window = gtk_widget_get_window GTK_WIDGET((applet));
#endif
gtk_widget_set_app_paintable(GTK_WIDGET(applet),TRUE);
if (applet->priv->out_of_process)
@@ -2355,6 +2355,7 @@ _mate_panel_applet_factory_main_internal (const gchar *factory_id,
/**
* panel_applet_factory_main:
+ * @out_process: boolean, dummy to support applets sending it
* @factory_id: Factory ID.
* @applet_type: GType of the applet this factory creates.
* @callback: (scope call): Callback to be called when a new applet is to be created.
@@ -2364,6 +2365,7 @@ _mate_panel_applet_factory_main_internal (const gchar *factory_id,
*/
int
mate_panel_applet_factory_main (const gchar *factory_id,
+ gboolean out_process, /*Dummy to support applets w issues with this */
GType applet_type,
MatePanelAppletFactoryCallback callback,
gpointer user_data)
diff --git a/libmate-panel-applet/mate-panel-applet.h b/libmate-panel-applet/mate-panel-applet.h
index 842a2ab9..d24f5d85 100644
--- a/libmate-panel-applet/mate-panel-applet.h
+++ b/libmate-panel-applet/mate-panel-applet.h
@@ -112,10 +112,10 @@ void mate_panel_applet_request_focus(MatePanelApplet* applet, guint32 timestamp)
void mate_panel_applet_setup_menu(MatePanelApplet* applet, const gchar* xml, GtkActionGroup* action_group);
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, GType applet_type, MatePanelAppletFactoryCallback callback, gpointer data);
+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 panel_applet_factory_setup_in_process (const gchar *factory_factory_id,
+int mate_panel_applet_factory_setup_in_process (const gchar *factory_factory_id,
GType applet_type,
MatePanelAppletFactoryCallback callback,
gpointer data);
@@ -149,6 +149,7 @@ int main(int argc, char* argv[]) \
GOptionContext* context; \
GError* error; \
int retval; \
+ gboolean out_process; \
\
_MATE_PANEL_APPLET_SETUP_GETTEXT (TRUE); \
\
@@ -173,7 +174,7 @@ int main(int argc, char* argv[]) \
\
gtk_init (&argc, &argv); \
\
- retval = mate_panel_applet_factory_main (factory_id, type, callback, data); \
+ retval = mate_panel_applet_factory_main (factory_id,out_process, type, callback, data); \
g_option_context_free (context); \
\
return retval; \