From 401faa0e87a8769607b979ac464be8c0fc832ff7 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Fri, 14 Jul 2017 17:18:59 -0400 Subject: limatepanel-applet: add panel-applet-private.h ... and move private functions from factory to this file. Later we will have at least one more private function. Based on https://github.com/GNOME/gnome-panel/commit/c04da8c76ee6f16af44faca2b247df71e98b0a4b plus one more change as it was added out of order --- libmate-panel-applet/Makefile.am | 3 +- libmate-panel-applet/mate-panel-applet-factory.c | 1 + libmate-panel-applet/mate-panel-applet-factory.h | 7 ----- libmate-panel-applet/mate-panel-applet.c | 1 + libmate-panel-applet/panel-applet-private.h | 37 ++++++++++++++++++++++++ 5 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 libmate-panel-applet/panel-applet-private.h diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am index a89c8f92..dfe056ea 100644 --- a/libmate-panel-applet/Makefile.am +++ b/libmate-panel-applet/Makefile.am @@ -24,7 +24,8 @@ libmate_panel_applet_4_la_SOURCES = \ mate-panel-applet-gsettings.c \ mate-panel-applet-gsettings.h \ panel-plug.c \ - panel-plug-private.h + panel-plug-private.h \ + panel-applet-private.h libmate_panel_applet_4_la_LIBADD = \ $(LIBMATE_PANEL_APPLET_LIBS) \ diff --git a/libmate-panel-applet/mate-panel-applet-factory.c b/libmate-panel-applet/mate-panel-applet-factory.c index cf38d64c..fef1528c 100644 --- a/libmate-panel-applet/mate-panel-applet-factory.c +++ b/libmate-panel-applet/mate-panel-applet-factory.c @@ -20,6 +20,7 @@ */ #include "mate-panel-applet.h" +#include "panel-applet-private.h" #include "mate-panel-applet-factory.h" diff --git a/libmate-panel-applet/mate-panel-applet-factory.h b/libmate-panel-applet/mate-panel-applet-factory.h index 9726dd47..3eb9a22d 100644 --- a/libmate-panel-applet/mate-panel-applet-factory.h +++ b/libmate-panel-applet/mate-panel-applet-factory.h @@ -46,13 +46,6 @@ MatePanelAppletFactory *mate_panel_applet_factory_new (const gchar gboolean mate_panel_applet_factory_register_service (MatePanelAppletFactory *factory); GtkWidget *mate_panel_applet_factory_get_applet_widget (const gchar *id, guint uid); - -/* This technically belongs to mate-panel-applet.h, but it's not something that - * should be public API. */ -guint32 mate_panel_applet_get_xid (MatePanelApplet *applet, - GdkScreen *screen); -const gchar *mate_panel_applet_get_object_path (MatePanelApplet *applet); - #ifdef __cplusplus } #endif diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index e881667e..030e829d 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -42,6 +42,7 @@ #include #include "mate-panel-applet.h" +#include "panel-applet-private.h" #include "mate-panel-applet-factory.h" #include "mate-panel-applet-marshal.h" #include "mate-panel-applet-enums.h" diff --git a/libmate-panel-applet/panel-applet-private.h b/libmate-panel-applet/panel-applet-private.h new file mode 100644 index 00000000..fe3e013b --- /dev/null +++ b/libmate-panel-applet/panel-applet-private.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2010 Carlos Garcia Campos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, see . + * + * Authors: + * Carlos Garcia Campos + */ + +#ifndef PANEL_APPLET_PRIVATE_H +#define PANEL_APPLET_RPIVATE_H + +#include "mate-panel-applet.h" + +G_BEGIN_DECLS + +guint32 mate_panel_applet_get_xid (MatePanelApplet *applet, + GdkScreen *screen); +const gchar *mate_panel_applet_get_object_path (MatePanelApplet *applet); + +GtkWidget *mate_panel_applet_get_applet_widget (const gchar *factory_id, + guint uid); + +G_END_DECLS + +#endif -- cgit v1.2.1