diff options
26 files changed, 0 insertions, 5080 deletions
diff --git a/matecomponent/Makefile.am b/matecomponent/Makefile.am deleted file mode 100644 index 831b4c8e..00000000 --- a/matecomponent/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = idl libmate-panel-applet panel-module - --include $(top_srcdir)/git.mk diff --git a/matecomponent/idl/MATE_Panel.idl b/matecomponent/idl/MATE_Panel.idl deleted file mode 100644 index 472b9ff5..00000000 --- a/matecomponent/idl/MATE_Panel.idl +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef MATE_PANEL_IDL -#define MATE_PANEL_IDL - -#include <MateComponent_Unknown.idl> - -module MATE { - module Vertigo { - - /* - * The panel's orientation. - */ - typedef unsigned short PanelOrient; - - const PanelOrient PANEL_ORIENT_UP = 0; - const PanelOrient PANEL_ORIENT_DOWN = 1; - const PanelOrient PANEL_ORIENT_LEFT = 2; - const PanelOrient PANEL_ORIENT_RIGHT = 3; - - /* - * The panel's width or height, depending - * on its orientation. - */ - typedef unsigned short PanelSize; - - const PanelSize PANEL_XX_SMALL = 12; - const PanelSize PANEL_X_SMALL = 24; - const PanelSize PANEL_SMALL = 36; - const PanelSize PANEL_MEDIUM = 48; - const PanelSize PANEL_LARGE = 64; - const PanelSize PANEL_X_LARGE = 80; - const PanelSize PANEL_XX_LARGE = 128; - - /* Used for the size hints list */ - typedef sequence<long> SizeHintList; - - /* - * MATE::PanelBackground Format: - * o "none:" - no background. - * o "colour:xxxxxx' - rgb colour value. - * o "pixmap:XID,x,y" - the pixmap XID, and the applets offsets into - * that pixmap. - */ - typedef string PanelBackground; - - interface MatePanelAppletShell : MateComponent::Unknown { - oneway void popup_menu (in long button, in long time); - }; - }; -}; - -#endif /* MATE_PANEL_IDL */ diff --git a/matecomponent/idl/Makefile.am b/matecomponent/idl/Makefile.am deleted file mode 100644 index a3141042..00000000 --- a/matecomponent/idl/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -idldir = $(datadir)/idl/mate-panel-2.0 -idl_DATA = MATE_Panel.idl - -EXTRA_DIST = $(idl_DATA) - --include $(top_srcdir)/git.mk diff --git a/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in b/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in deleted file mode 100644 index 18f2629f..00000000 --- a/matecomponent/libmate-panel-applet/MATE_Panel_TestApplet.server.in +++ /dev/null @@ -1,31 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:MATE_Panel_TestMateComponentApplet_Factory" - type="exe" - location="test-matecomponent-applet"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:MateComponent/GenericFactory:1.0"/> - <item value="IDL:MateComponent/Unknown:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Test MateComponent Applet Factory"/> - <oaf_attribute name="description" type="string" _value="Test MateComponent Applet Factory"/> - -</oaf_server> - -<oaf_server iid="OAFIID:MATE_Panel_TestMateComponentApplet" - type="factory" - location="OAFIID:MATE_Panel_TestMateComponentApplet_Factory"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:MATE/Vertigo/MatePanelAppletShell:1.0"/> - <item value="IDL:MateComponent/Control:1.0"/> - <item value="IDL:MateComponent/Unknown:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Test MateComponent Applet"/> - <oaf_attribute name="description" type="string" _value="A simple applet for testing the MATE-2.0 panel"/> - <oaf_attribute name="panel:icon" type="string" value="mate-gegl.png"/> - -</oaf_server> - -</oaf_info> diff --git a/matecomponent/libmate-panel-applet/Makefile.am b/matecomponent/libmate-panel-applet/Makefile.am deleted file mode 100644 index 1cd38d9f..00000000 --- a/matecomponent/libmate-panel-applet/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -lib_LTLIBRARIES = libmate-panel-applet-2.la -bin_PROGRAMS = panel-test-applets-matecomponent -noinst_PROGRAMS = test-matecomponent-applet - -AM_CPPFLAGS = \ - $(LIBMATE_PANEL_APPLET_MATECOMPONENT_CFLAGS) \ - -I$(top_builddir)/matecomponent/libmate-panel-applet \ - -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DMATE_PANEL_APPLET_DATADIR=\""$(datadir)"\" \ - -DMATE_PANEL_APPLET_BUILDERDIR=\""$(uidir)"\" \ - $(DISABLE_DEPRECATED_CFLAGS) - -AM_CFLAGS = $(WARN_CFLAGS) - -libmate_panel_appletincludedir = $(includedir)/panel-2.0 -libmate_panel_appletinclude_HEADERS = \ - mate-panel-applet.h \ - mate-panel-applet-mateconf.h \ - mate-panel-applet-enums.h \ - MATE_Panel.h - -libmate_panel_applet_2_la_SOURCES = \ - mate-panel-applet.h \ - mate-panel-applet.c \ - mate-panel-applet-mateconf.c \ - mate-panel-applet-mateconf.h \ - mate-panel-applet-shell.c \ - mate-panel-applet-shell.h \ - mate-panel-applet-private.h \ - mate-panel-applet-marshal.c \ - mate-panel-applet-marshal.h \ - mate-panel-applet-enums.c \ - mate-panel-applet-enums.h \ - $(CORBA_SRCLIST) - -libmate_panel_applet_2_la_LDFLAGS = \ - -version-info $(LIB_MATE_PANEL_APPLET_MATECOMPONENT_LT_VERSION) \ - -no-undefined -libmate_panel_applet_2_la_LIBADD = \ - $(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS) \ - $(X_LIBS) - -panel_test_applets_matecomponent_LDADD = \ - $(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS) - -test_matecomponent_applet_LDADD = \ - $(LIBMATE_PANEL_APPLET_MATECOMPONENT_LIBS) \ - libmate-panel-applet-2.la - -$(libmate_panel_applet_2_la_OBJECTS) $(test_matecomponent_applet_matecomponent_OBJECTS): $(BUILT_SOURCES) - -CORBA_SRCLIST = \ - MATE_Panel-stubs.c \ - MATE_Panel-skels.c \ - MATE_Panel-common.c \ - MATE_Panel.h - -$(CORBA_SRCLIST): $(top_srcdir)/matecomponent/idl/MATE_Panel.idl $(MATECORBA_IDL) - $(AM_V_GEN)$(MATECORBA_IDL) -I $(MATECOMPONENT_IDLDIR) -I $(MATECOMPONENT_ACT_IDLDIR) $(top_srcdir)/matecomponent/idl/MATE_Panel.idl - -mate-panel-applet-marshal.h: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL) - $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=mate_panel_applet_marshal > $@ - -mate-panel-applet-marshal.c: mate-panel-applet-marshal.list $(GLIB_GENMARSHAL) - $(AM_V_GEN)echo "#include \"mate-panel-applet-marshal.h\"" > $@ && \ - $(GLIB_GENMARSHAL) $< --body --prefix=mate_panel_applet_marshal >> $@ - -mate_panel_applet_enum_headers = $(top_srcdir)/libmate-panel-applet/mate-panel-applet.h - -mate-panel-applet-enums.c: @REBUILD@ $(mate_panel_applet_enum_headers) - $(AM_V_GEN)glib-mkenums \ - --fhead "#include <glib-object.h>\n" \ - --fhead "#include \"mate-panel-applet-enums.h\"\n\n" \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --fprod "\n#include \"@filename@\"\n" \ - --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n};\n\n" \ - --vtail "GType\n@enum_name@_get_type (void)\n{\n" \ - --vtail " static GType type = 0;\n\n" \ - --vtail " if (!type)\n" \ - --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \ - --vtail " return type;\n}\n\n" \ - $(mate_panel_applet_enum_headers) > $@ - -mate-panel-applet-enums.h: @REBUILD@ $(mate_panel_applet_enum_headers) - $(AM_V_GEN)glib-mkenums \ - --fhead "#ifndef __MATE_PANEL_APPLET_ENUMS_H__\n" \ - --fhead "#define __MATE_PANEL_APPLET_ENUMS_H__\n\n" \ - --fhead "#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n" \ - --ftail "#ifdef __cplusplus\n}\n#endif\n\n" \ - --ftail "#endif /* __MATE_PANEL_APPLET_ENUMS_H__ */\n" \ - --fprod "\n/* --- @filename@ --- */" \ - --eprod "#define PANEL_TYPE_@ENUMNAME@ @enum_name@_get_type()\n" \ - --eprod "GType @enum_name@_get_type (void);\n" \ - $(mate_panel_applet_enum_headers) > $@ - -BUILT_SOURCES = \ - $(CORBA_SRCLIST) \ - mate-panel-applet-enums.c \ - mate-panel-applet-enums.h \ - mate-panel-applet-marshal.c \ - mate-panel-applet-marshal.h - -uidir = $(datadir)/mate-panel/ui -ui_DATA = panel-test-applets-matecomponent.ui - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmatepanelapplet-2.0.pc - -serverdir = $(libdir)/matecomponent/servers -server_in_files = MATE_Panel_TestApplet.server.in -noinst_DATA = $(server_in_files:.server.in=.server) - -@INTLTOOL_SERVER_RULE@ - -EXTRA_DIST = \ - MATE_Panel_TestApplet.server.in \ - mate-panel-applet-marshal.list \ - libmatepanelapplet-2.0.pc.in \ - libmatepanelapplet-2.0-uninstalled.pc.in \ - panel-test-applets-matecomponent.ui - -CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA) - -dist-hook: - cd $(distdir) ; rm -f $(CLEANFILES) - --include $(top_srcdir)/git.mk diff --git a/matecomponent/libmate-panel-applet/TODO b/matecomponent/libmate-panel-applet/TODO deleted file mode 100644 index e0384730..00000000 --- a/matecomponent/libmate-panel-applet/TODO +++ /dev/null @@ -1,14 +0,0 @@ -libmate-panel-applet todo list -========================= - - Things that need to be finished before this library can be considered -anyway complete. - - * Size negotiation. Basically make sure this works. It should be no - different than the usual GtkWidget size request/allocation. The - applets shouldn't be allowed to be any bigger than the panel. The - other issue is with applets that want to expand to fill the available - space on the panel. At the moment this is solved with getExpandFlags, - but this ends up with some freaky stuff going on when you're moving - applets. Maybe we should consider having a re-sizable flag which would - make the applets have grabs for re-sizing. diff --git a/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in deleted file mode 100644 index 4b9b6c49..00000000 --- a/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmate-panel-applet-2 -Description: libmate-panel-applet-2 -Requires: mateconf-2.0 gtk+-2.0 libmatecomponentui-2.0 -Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/libmate-panel-applet-2.la -Cflags: -I${pc_top_builddir}/${pcfiledir} diff --git a/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in b/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in deleted file mode 100644 index a790b2c8..00000000 --- a/matecomponent/libmate-panel-applet/libmatepanelapplet-2.0.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libmate-panel-applet-2 -Description: libmate-panel-applet-2 -Requires: mateconf-2.0 gtk+-2.0 libmatecomponentui-2.0 -Version: @VERSION@ -Libs: -L${libdir} -lmate-panel-applet-2 -Cflags: -I${includedir}/panel-2.0 diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-marshal.list b/matecomponent/libmate-panel-applet/mate-panel-applet-marshal.list deleted file mode 100644 index 1693a57d..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-marshal.list +++ /dev/null @@ -1,5 +0,0 @@ -VOID:ENUM,BOXED,OBJECT -VOID:INT -VOID:UINT -VOID:ENUM -BOOLEAN:STRING diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c b/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c deleted file mode 100644 index 588df9ef..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.c +++ /dev/null @@ -1,458 +0,0 @@ -/* - * mate-panel-applet-mateconf.c: panel applet preferences handling. - * - * Copyright (C) 2001-2003 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#include <mateconf/mateconf-client.h> - -#include "mate-panel-applet-mateconf.h" -#include "mate-panel-applet-private.h" - -static MateConfClient * -mate_panel_applet_mateconf_get_client (void) -{ - static MateConfClient *client = NULL; - - if (!client) - client = mateconf_client_get_default (); - - return client; -} - -gchar * -mate_panel_applet_mateconf_get_full_key (MatePanelApplet *applet, - const gchar *key) -{ - gchar *prefs_key; - gchar *full_key; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (!key) - return NULL; - - prefs_key = mate_panel_applet_get_preferences_key (applet); - - full_key = g_strdup_printf ("%s/%s", prefs_key, key); - - g_free (prefs_key); - - return full_key; -} - -void -mate_panel_applet_mateconf_set_bool (MatePanelApplet *applet, - const gchar *key, - gboolean the_bool, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set_bool (client, full_key, the_bool, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -void -mate_panel_applet_mateconf_set_int (MatePanelApplet *applet, - const gchar *key, - gint the_int, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set_int (client, full_key, the_int, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -void -mate_panel_applet_mateconf_set_string (MatePanelApplet *applet, - const gchar *key, - const gchar *the_string, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set_string (client, full_key, the_string, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -void -mate_panel_applet_mateconf_set_float (MatePanelApplet *applet, - const gchar *key, - gdouble the_float, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set_float (client, full_key, the_float, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -void -mate_panel_applet_mateconf_set_list (MatePanelApplet *applet, - const gchar *key, - MateConfValueType list_type, - GSList *list, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set_list (client, full_key, list_type, list, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -void -mate_panel_applet_mateconf_set_value (MatePanelApplet *applet, - const gchar *key, - MateConfValue *value, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - mateconf_client_set (client, full_key, value, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } -} - -gboolean -mate_panel_applet_mateconf_get_bool (MatePanelApplet *applet, - const gchar *key, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - gboolean retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get_bool (client, full_key, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} - -gint -mate_panel_applet_mateconf_get_int (MatePanelApplet *applet, - const gchar *key, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - gint retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), -1); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get_int (client, full_key, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} - -gchar * -mate_panel_applet_mateconf_get_string (MatePanelApplet *applet, - const gchar *key, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - gchar *retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get_string (client, full_key, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} - -gdouble -mate_panel_applet_mateconf_get_float (MatePanelApplet *applet, - const gchar *key, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - gdouble retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), 0.0); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get_float (client, full_key, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} - -MateConfValue * -mate_panel_applet_mateconf_get_value (MatePanelApplet *applet, - const gchar *key, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - MateConfValue *retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get (client, full_key, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} - -GSList * -mate_panel_applet_mateconf_get_list (MatePanelApplet *applet, - const gchar *key, - MateConfValueType list_type, - GError **opt_error) -{ - MateConfClient *client; - gchar *full_key; - GSList *retval; - GError **error = NULL; - GError *our_error = NULL; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (opt_error) - error = opt_error; - else - error = &our_error; - - full_key = mate_panel_applet_mateconf_get_full_key (applet, key); - - client = mate_panel_applet_mateconf_get_client (); - - retval = mateconf_client_get_list (client, full_key, list_type, error); - - g_free (full_key); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": mateconf error : '%s'", our_error->message); - g_error_free (our_error); - } - - return retval; -} diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.h b/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.h deleted file mode 100644 index 2eb523a4..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-mateconf.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * mate-panel-applet-mateconf.h: panel applet preferences handling. - * - * Copyright (C) 2001-2003 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifndef __MATE_PANEL_APPLET_MATECONF_H__ -#define __MATE_PANEL_APPLET_MATECONF_H__ - -#include <glib.h> -#include <mateconf/mateconf-value.h> - -#include <mate-panel-applet.h> - -#ifdef __cplusplus -extern "C" { -#endif - -gchar *mate_panel_applet_mateconf_get_full_key (MatePanelApplet *applet, - const gchar *key); - -void mate_panel_applet_mateconf_set_bool (MatePanelApplet *applet, - const gchar *key, - gboolean the_bool, - GError **opt_error); -void mate_panel_applet_mateconf_set_int (MatePanelApplet *applet, - const gchar *key, - gint the_int, - GError **opt_error); -void mate_panel_applet_mateconf_set_string (MatePanelApplet *applet, - const gchar *key, - const gchar *the_string, - GError **opt_error); -void mate_panel_applet_mateconf_set_float (MatePanelApplet *applet, - const gchar *key, - gdouble the_float, - GError **opt_error); -void mate_panel_applet_mateconf_set_list (MatePanelApplet *applet, - const gchar *key, - MateConfValueType list_type, - GSList *list, - GError **opt_error); -void mate_panel_applet_mateconf_set_value (MatePanelApplet *applet, - const gchar *key, - MateConfValue *value, - GError **opt_error); - -gboolean mate_panel_applet_mateconf_get_bool (MatePanelApplet *applet, - const gchar *key, - GError **opt_error); -gint mate_panel_applet_mateconf_get_int (MatePanelApplet *applet, - const gchar *key, - GError **opt_error); -gchar *mate_panel_applet_mateconf_get_string (MatePanelApplet *applet, - const gchar *key, - GError **opt_error); -gdouble mate_panel_applet_mateconf_get_float (MatePanelApplet *applet, - const gchar *key, - GError **opt_error); -GSList *mate_panel_applet_mateconf_get_list (MatePanelApplet *applet, - const gchar *key, - MateConfValueType list_type, - GError **opt_error); -MateConfValue *mate_panel_applet_mateconf_get_value (MatePanelApplet *applet, - const gchar *key, - GError **opt_error); - -#ifdef __cplusplus -} -#endif - -#endif /* __MATE_PANEL_APPLET_MATECONF_H__ */ diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-private.h b/matecomponent/libmate-panel-applet/mate-panel-applet-private.h deleted file mode 100644 index 6cc36abd..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-private.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * mate-panel-applet-private.h: - * - * Copyright (C) 2001 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifndef __MATE_PANEL_APPLET_PRIVATE_H__ -#define __MATE_PANEL_APPLET_PRIVATE_H__ - -#include "mate-panel-applet.h" - -#ifdef __cplusplus -extern "C" { -#endif - -gboolean _mate_panel_applet_popup_menu (MatePanelApplet *applet, guint button, guint32 time); - -#ifdef __cplusplus -} -#endif - -#endif /* __MATE_PANEL_APPLET_PRIVATE_H__ */ diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c deleted file mode 100644 index a9b56489..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * mate-panel-applet-shell.c: the panel's interface to the applet. - * - * Copyright (C) 2001 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#include <config.h> - -#include "mate-panel-applet-shell.h" -#include "mate-panel-applet.h" -#include "mate-panel-applet-private.h" - -struct _MatePanelAppletShellPrivate { - MatePanelApplet *applet; -}; - -static GObjectClass *parent_class = NULL; - -static void -impl_MatePanelAppletShell_popup_menu (PortableServer_Servant servant, - CORBA_long button, - CORBA_long time, - CORBA_Environment *ev) -{ - MatePanelAppletShell *applet_shell; - - applet_shell = MATE_PANEL_APPLET_SHELL (matecomponent_object (servant)); - - _mate_panel_applet_popup_menu (applet_shell->priv->applet, button, time); -} - -static void -mate_panel_applet_shell_finalize (GObject *object) -{ - MatePanelAppletShell *shell = MATE_PANEL_APPLET_SHELL (object); - - if (shell->priv) { - g_free (shell->priv); - shell->priv = NULL; - } - - parent_class->finalize (object); -} - -static void -mate_panel_applet_shell_class_init (MatePanelAppletShellClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - klass->epv.popup_menu = impl_MatePanelAppletShell_popup_menu; - - object_class->finalize = mate_panel_applet_shell_finalize; - - parent_class = g_type_class_peek_parent (klass); -} - -static void -mate_panel_applet_shell_init (MatePanelAppletShell *shell) -{ - shell->priv = g_new0 (MatePanelAppletShellPrivate, 1); - - shell->priv->applet = NULL; -} - -MATECOMPONENT_TYPE_FUNC_FULL (MatePanelAppletShell, - MATE_Vertigo_MatePanelAppletShell, - MATECOMPONENT_OBJECT_TYPE, - mate_panel_applet_shell) - -void -mate_panel_applet_shell_construct (MatePanelAppletShell *shell, - MatePanelApplet *applet) -{ - shell->priv->applet = applet; -} - -MatePanelAppletShell * -mate_panel_applet_shell_new (MatePanelApplet *applet) -{ - MatePanelAppletShell *shell; - - shell = g_object_new (MATE_PANEL_APPLET_SHELL_TYPE, NULL); - - mate_panel_applet_shell_construct (shell, applet); - - return shell; -} diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h b/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h deleted file mode 100644 index b4c7d548..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet-shell.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * mate-panel-applet-shell.h: the panel's interface to the applet. - * - * Copyright (C) 2001 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifndef __MATE_PANEL_APPLET_SHELL_H__ -#define __MATE_PANEL_APPLET_SHELL_H__ - -#include <matecomponent/matecomponent-object.h> - -#include <mate-panel-applet.h> -#include <MATE_Panel.h> - -#define MATE_PANEL_APPLET_SHELL_TYPE (mate_panel_applet_shell_get_type ()) -#define MATE_PANEL_APPLET_SHELL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MATE_PANEL_APPLET_SHELL_TYPE, MatePanelAppletShell)) -#define MATE_PANEL_APPLET_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MATE_PANEL_APPLET_SHELL_TYPE, MatePanelAppletShellClass)) -#define PANEL_IS_APPLET_SHELL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MATE_PANEL_APPLET_SHELL_TYPE)) -#define PANEL_IS_APPLET_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MATE_PANEL_APPLET_SHELL_TYPE)) - -typedef struct _MatePanelAppletShellPrivate MatePanelAppletShellPrivate; - -typedef struct { - MateComponentObject base; - - MatePanelAppletShellPrivate *priv; -} MatePanelAppletShell; - -typedef struct { - MateComponentObjectClass base_class; - - POA_MATE_Vertigo_MatePanelAppletShell__epv epv; -} MatePanelAppletShellClass; - - -GType mate_panel_applet_shell_get_type (void) G_GNUC_CONST; - -void mate_panel_applet_shell_construct (MatePanelAppletShell *shell, - MatePanelApplet *applet); - -MatePanelAppletShell *mate_panel_applet_shell_new (MatePanelApplet *applet); - - -#endif /* MATE_PANEL_APPLET_SHELL_H */ diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.c b/matecomponent/libmate-panel-applet/mate-panel-applet.c deleted file mode 100644 index d8ad2a0a..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet.c +++ /dev/null @@ -1,1830 +0,0 @@ -/* - * mate-panel-applet.c: panel applet writing library. - * - * Copyright (C) 2001 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <unistd.h> -#include <stdlib.h> -#include <string.h> - -#include <cairo.h> -#include <gdk/gdk.h> -#include <gdk/gdkx.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> -#include <matecomponent/matecomponent-ui-util.h> -#include <matecomponent/matecomponent-main.h> -#include <matecomponent/matecomponent-types.h> -#include <matecomponent/matecomponent-property-bag.h> -#include <matecomponent/matecomponent-item-handler.h> -#include <matecomponent/matecomponent-property-bag-client.h> -#include <mateconf/mateconf.h> -#include <mateconf/mateconf-client.h> -#include <X11/Xatom.h> - -#include "mate-panel-applet.h" -#include "mate-panel-applet-private.h" -#include "mate-panel-applet-shell.h" -#include "mate-panel-applet-marshal.h" -#include "mate-panel-applet-enums.h" - -#define MATE_PANEL_APPLET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_APPLET, MatePanelAppletPrivate)) - -struct _MatePanelAppletPrivate { - MatePanelAppletShell *shell; - MateComponentControl *control; - MateComponentPropertyBag *prop_sack; - MateComponentItemHandler *item_handler; - MateConfClient *client; - - char *iid; - GClosure *closure; - gboolean bound; - char *prefs_key; - - MatePanelAppletFlags flags; - MatePanelAppletOrient orient; - guint size; - char *background; - GtkWidget *background_widget; - - int previous_width; - int previous_height; - - int *size_hints; - int size_hints_len; - - gboolean moving_focus_out; - - gboolean locked_down; -}; - -enum { - CHANGE_ORIENT, - CHANGE_SIZE, - CHANGE_BACKGROUND, - MOVE_FOCUS_OUT_OF_APPLET, - SAVE_YOURSELF, - LAST_SIGNAL -}; - -static guint mate_panel_applet_signals [LAST_SIGNAL]; - -#define PROPERTY_ORIENT "mate-panel-applet-orient" -#define PROPERTY_SIZE "mate-panel-applet-size" -#define PROPERTY_BACKGROUND "mate-panel-applet-background" -#define PROPERTY_FLAGS "mate-panel-applet-flags" -#define PROPERTY_SIZE_HINTS "mate-panel-applet-size-hints" -#define PROPERTY_LOCKED_DOWN "mate-panel-applet-locked-down" - -enum { - PROPERTY_ORIENT_IDX, - PROPERTY_SIZE_IDX, - PROPERTY_BACKGROUND_IDX, - PROPERTY_FLAGS_IDX, - PROPERTY_SIZE_HINTS_IDX, - PROPERTY_LOCKED_DOWN_IDX -}; - -G_DEFINE_TYPE (MatePanelApplet, mate_panel_applet, GTK_TYPE_EVENT_BOX) - -static void mate_panel_applet_handle_background (MatePanelApplet *applet); -static void mate_panel_applet_setup (MatePanelApplet *applet); - -static void -mate_panel_applet_associate_schemas_in_dir (MateConfClient *client, - const gchar *prefs_key, - const gchar *schema_dir, - GError **error) -{ - GSList *list, *l; - - list = mateconf_client_all_entries (client, schema_dir, error); - - if (*error != NULL) - return; - - for (l = list; l; l = l->next) { - MateConfEntry *entry = l->data; - const gchar *schema_key; - MateConfEntry *applet_entry; - const gchar *applet_schema_key; - gchar *key; - gchar *tmp; - - schema_key = mateconf_entry_get_key (entry); - tmp = g_path_get_basename (schema_key); - - if (strchr (tmp, '-')) - g_warning ("Applet key '%s' contains a hyphen. Please " - "use underscores in mateconf keys\n", tmp); - - key = g_strdup_printf ("%s/%s", prefs_key, tmp); - g_free (tmp); - - /* Associating a schema is potentially expensive, so let's try - * to avoid this by doing it only when needed. So we check if - * the key is already correctly associated. */ - - applet_entry = mateconf_client_get_entry (client, key, - NULL, TRUE, NULL); - if (applet_entry) - applet_schema_key = mateconf_entry_get_schema_name (applet_entry); - else - applet_schema_key = NULL; - - if (g_strcmp0 (schema_key, applet_schema_key) != 0) { - mateconf_engine_associate_schema (client->engine, - key, schema_key, error); - - if (applet_entry == NULL || - mateconf_entry_get_value (applet_entry) == NULL || - mateconf_entry_get_is_default (applet_entry)) { - /* unset the key: mateconf_client_get_entry() - * brought an invalid entry in the client - * cache, and we want to fix this */ - mateconf_client_unset (client, key, NULL); - } - } - - g_free (key); - - if (applet_entry) - mateconf_entry_unref (applet_entry); - mateconf_entry_unref (entry); - - if (*error) { - g_slist_free (list); - return; - } - } - - g_slist_free (list); - - list = mateconf_client_all_dirs (client, schema_dir, error); - - for (l = list; l; l = l->next) { - gchar *subdir = l->data; - gchar *prefs_subdir; - gchar *schema_subdir; - gchar *tmp; - - tmp = g_path_get_basename (subdir); - - prefs_subdir = g_strdup_printf ("%s/%s", prefs_key, tmp); - schema_subdir = g_strdup_printf ("%s/%s", schema_dir, tmp); - - mate_panel_applet_associate_schemas_in_dir (client, - prefs_subdir, - schema_subdir, - error); - - g_free (prefs_subdir); - g_free (schema_subdir); - g_free (subdir); - g_free (tmp); - - if (*error) { - g_slist_free (list); - return; - } - } - - g_slist_free (list); -} - -void -mate_panel_applet_add_preferences (MatePanelApplet *applet, - const gchar *schema_dir, - GError **opt_error) -{ - GError **error = NULL; - GError *our_error = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - g_return_if_fail (schema_dir != NULL); - - if (!applet->priv->prefs_key) - return; - - if (opt_error) - error = opt_error; - else - error = &our_error; - - mate_panel_applet_associate_schemas_in_dir (applet->priv->client, - applet->priv->prefs_key, - schema_dir, - error); - - if (!opt_error && our_error) { - g_warning (G_STRLOC ": failed to add preferences from '%s' : '%s'", - schema_dir, our_error->message); - g_error_free (our_error); - } -} - -char * -mate_panel_applet_get_preferences_key (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (!applet->priv->prefs_key) - return NULL; - - return g_strdup (applet->priv->prefs_key); -} - -static void -mate_panel_applet_set_preferences_key (MatePanelApplet *applet, - const char *prefs_key) -{ - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (applet->priv->prefs_key) { - mateconf_client_remove_dir (applet->priv->client, - applet->priv->prefs_key, - NULL); - - g_free (applet->priv->prefs_key); - applet->priv->prefs_key = NULL; - } - - if (prefs_key) { - applet->priv->prefs_key = g_strdup (prefs_key); - - mateconf_client_add_dir (applet->priv->client, - applet->priv->prefs_key, - MATECONF_CLIENT_PRELOAD_RECURSIVE, - NULL); - } -} - -MatePanelAppletFlags -mate_panel_applet_get_flags (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), MATE_PANEL_APPLET_FLAGS_NONE); - - return applet->priv->flags; -} - -void -mate_panel_applet_set_flags (MatePanelApplet *applet, - MatePanelAppletFlags flags) -{ - g_return_if_fail (PANEL_IS_APPLET (applet)); - - if (applet->priv->prop_sack != NULL) - matecomponent_pbclient_set_short (MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_FLAGS, flags, NULL); - else - applet->priv->flags = flags; -} - -void -mate_panel_applet_set_size_hints (MatePanelApplet *applet, - const int *size_hints, - int n_elements, - int base_size) -{ - CORBA_sequence_CORBA_long *seq; - CORBA_Environment env; - CORBA_any any; - int i; - - CORBA_exception_init (&env); - - seq = CORBA_sequence_CORBA_long__alloc (); - seq->_length = seq->_maximum = n_elements; - seq->_release = CORBA_TRUE; - seq->_buffer = CORBA_sequence_CORBA_long_allocbuf (seq->_length); - - for (i = 0; i < n_elements; i++) - seq->_buffer [i] = size_hints [i] + base_size; - - any._type = TC_CORBA_sequence_CORBA_long; - any._release = CORBA_FALSE; - any._value = seq; - - MateComponent_PropertyBag_setValue (MATECOMPONENT_OBJREF (applet->priv->prop_sack), - PROPERTY_SIZE_HINTS, - &any, - &env); - - CORBA_free (seq); - - CORBA_exception_free (&env); -} - -guint -mate_panel_applet_get_size (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), 0); - - return applet->priv->size; -} - -MatePanelAppletOrient -mate_panel_applet_get_orient (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), 0); - - return applet->priv->orient; -} - -gboolean -mate_panel_applet_get_locked_down (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE); - - return applet->priv->locked_down; -} - -static Atom _net_wm_window_type = None; -static Atom _net_wm_window_type_dock = None; -static Atom _net_active_window = None; - -static void -mate_panel_applet_init_atoms (Display *xdisplay) -{ - if (_net_wm_window_type == None) - _net_wm_window_type = XInternAtom (xdisplay, - "_NET_WM_WINDOW_TYPE", - False); - - if (_net_wm_window_type_dock == None) - _net_wm_window_type_dock = XInternAtom (xdisplay, - "_NET_WM_WINDOW_TYPE_DOCK", - False); - - if (_net_active_window == None) - _net_active_window = XInternAtom (xdisplay, - "_NET_ACTIVE_WINDOW", - False); -} - -static Window -mate_panel_applet_find_toplevel_dock_window (MatePanelApplet *applet, - Display *xdisplay) -{ - GtkWidget *toplevel; - Window xwin; - Window root, parent, *child; - int num_children; - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet)); - if (!gtk_widget_get_realized (toplevel)) - return None; - - xwin = GDK_WINDOW_XID (gtk_widget_get_window (toplevel)); - - child = NULL; - parent = root = None; - do { - Atom type_return; - Atom window_type; - int format_return; - gulong number_return, bytes_after_return; - guchar *data_return; - - XGetWindowProperty (xdisplay, - xwin, - _net_wm_window_type, - 0, 1, False, - XA_ATOM, - &type_return, &format_return, - &number_return, - &bytes_after_return, - &data_return); - - if (type_return == XA_ATOM) { - window_type = *(Atom *) data_return; - - XFree (data_return); - data_return = NULL; - - if (window_type == _net_wm_window_type_dock) - return xwin; - } - - if (!XQueryTree (xdisplay, - xwin, - &root, &parent, &child, - (guint *) &num_children)) { - return None; - } - - if (child && num_children > 0) - XFree (child); - - xwin = parent; - - } while (xwin != None && xwin != root); - - return None; -} - -/* This function - * 1) Gets the window id of the panel that contains the applet - * using XQueryTree and XGetWindowProperty to find an ancestor - * window with the _NET_WM_WINDOW_TYPE_DOCK window type. - * 2) Sends a _NET_ACTIVE_WINDOW message to get that panel focused - */ -void -mate_panel_applet_request_focus (MatePanelApplet *applet, - guint32 timestamp) -{ - GdkScreen *screen; - GdkWindow *root; - GdkDisplay *display; - Display *xdisplay; - Window dock_xwindow; - Window xroot; - XEvent xev; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - - screen = gtk_widget_get_screen (GTK_WIDGET (applet)); - root = gdk_screen_get_root_window (screen); - display = gdk_screen_get_display (screen); - - xdisplay = GDK_DISPLAY_XDISPLAY (display); - xroot = GDK_WINDOW_XWINDOW (root); - - mate_panel_applet_init_atoms (xdisplay); - - dock_xwindow = mate_panel_applet_find_toplevel_dock_window (applet, xdisplay); - if (dock_xwindow == None) - return; - - xev.xclient.type = ClientMessage; - xev.xclient.serial = 0; - xev.xclient.send_event = True; - xev.xclient.window = dock_xwindow; - xev.xclient.message_type = _net_active_window; - xev.xclient.format = 32; - xev.xclient.data.l[0] = 1; /* requestor type; we're an app, I guess */ - xev.xclient.data.l[1] = timestamp; - xev.xclient.data.l[2] = None; /* "currently active window", supposedly */ - xev.xclient.data.l[3] = 0; - xev.xclient.data.l[4] = 0; - - XSendEvent (xdisplay, - xroot, False, - SubstructureRedirectMask | SubstructureNotifyMask, - &xev); -} - -void -mate_panel_applet_setup_menu (MatePanelApplet *applet, - const gchar *xml, - const MateComponentUIVerb *verb_list, - gpointer user_data) -{ - MateComponentUIComponent *popup_component; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - g_return_if_fail (xml != NULL && verb_list != NULL); - - popup_component = mate_panel_applet_get_popup_component (applet); - - matecomponent_ui_component_set (popup_component, "/", "<popups/>", NULL); - - matecomponent_ui_component_set_translate (popup_component, "/popups", xml, NULL); - - matecomponent_ui_component_add_verb_list_with_data (popup_component, verb_list, user_data); -} - -void -mate_panel_applet_setup_menu_from_file (MatePanelApplet *applet, - const gchar *opt_datadir, - const gchar *file, - const gchar *opt_app_name, - const MateComponentUIVerb *verb_list, - gpointer user_data) -{ - MateComponentUIComponent *popup_component; - gchar *app_name = NULL; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - g_return_if_fail (file != NULL && verb_list != NULL); - - if (!opt_datadir) - opt_datadir = MATE_PANEL_APPLET_DATADIR; - - if (!opt_app_name) - opt_app_name = app_name = g_strdup_printf ("%lu", - (unsigned long) getpid ()); - - popup_component = mate_panel_applet_get_popup_component (applet); - - matecomponent_ui_util_set_ui (popup_component, opt_datadir, file, opt_app_name, NULL); - - matecomponent_ui_component_add_verb_list_with_data (popup_component, verb_list, user_data); - - if (app_name) - g_free (app_name); -} - -MateComponentControl * -mate_panel_applet_get_control (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - return applet->priv->control; -} - -MateComponentUIComponent * -mate_panel_applet_get_popup_component (MatePanelApplet *applet) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - return matecomponent_control_get_popup_ui_component (applet->priv->control); -} - -static void -mate_panel_applet_finalize (GObject *object) -{ - MatePanelApplet *applet = MATE_PANEL_APPLET (object); - - mate_panel_applet_set_preferences_key (applet, NULL); - - if (applet->priv->client) - g_object_unref (applet->priv->client); - applet->priv->client = NULL; - - if (applet->priv->prop_sack) - matecomponent_object_unref ( - MATECOMPONENT_OBJECT (applet->priv->prop_sack)); - applet->priv->prop_sack = NULL; - - g_free (applet->priv->size_hints); - g_free (applet->priv->prefs_key); - g_free (applet->priv->background); - g_free (applet->priv->iid); - - if (applet->priv->closure) - g_closure_unref (applet->priv->closure); - applet->priv->closure = NULL; - - G_OBJECT_CLASS (mate_panel_applet_parent_class)->finalize (object); -} - -static gboolean -container_has_focusable_child (GtkContainer *container) -{ - GtkWidget *child; - GList *list; - GList *t; - gboolean retval = FALSE; - - list = gtk_container_get_children (container); - - for (t = list; t; t = t->next) { - child = GTK_WIDGET (t->data); - if (gtk_widget_get_can_focus (child)) { - retval = TRUE; - break; - } else if (GTK_IS_CONTAINER (child)) { - retval = container_has_focusable_child (GTK_CONTAINER (child)); - if (retval) - break; - } - } - g_list_free (list); - return retval; -} - -static void -mate_panel_applet_position_menu (GtkMenu *menu, - int *x, - int *y, - gboolean *push_in, - GtkWidget *widget) -{ - MatePanelApplet *applet; - GtkAllocation allocation; - GtkRequisition requisition; - GdkScreen *screen; - int menu_x = 0; - int menu_y = 0; - int pointer_x; - int pointer_y; - - g_return_if_fail (PANEL_IS_APPLET (widget)); - - applet = MATE_PANEL_APPLET (widget); - - screen = gtk_widget_get_screen (widget); - - gtk_widget_size_request (GTK_WIDGET (menu), &requisition); - - gdk_window_get_origin (gtk_widget_get_window (widget), - &menu_x, &menu_y); - gtk_widget_get_pointer (widget, &pointer_x, &pointer_y); - - gtk_widget_get_allocation (widget, &allocation); - - menu_x += allocation.x; - menu_y += allocation.y; - - if (applet->priv->orient == MATE_PANEL_APPLET_ORIENT_UP || - applet->priv->orient == MATE_PANEL_APPLET_ORIENT_DOWN) { - if (gtk_widget_get_direction (GTK_WIDGET (menu)) != GTK_TEXT_DIR_RTL) { - if (pointer_x < allocation.width && - requisition.width < pointer_x) - menu_x += MIN (pointer_x, - allocation.width - requisition.width); - } else { - menu_x += allocation.width - requisition.width; - if (pointer_x > 0 && pointer_x < allocation.width && - pointer_x < allocation.width - requisition.width) { - menu_x -= MIN (allocation.width - pointer_x, - allocation.width - requisition.width); - } - } - menu_x = MIN (menu_x, gdk_screen_get_width (screen) - requisition.width); - - if (menu_y > gdk_screen_get_height (screen) / 2) - menu_y -= requisition.height; - else - menu_y += allocation.height; - } else { - if (pointer_y < allocation.height && - requisition.height < pointer_y) - menu_y += MIN (pointer_y, allocation.height - requisition.height); - menu_y = MIN (menu_y, gdk_screen_get_height (screen) - requisition.height); - - if (menu_x > gdk_screen_get_width (screen) / 2) - menu_x -= requisition.width; - else - menu_x += allocation.width; - - } - - *x = menu_x; - *y = menu_y; - *push_in = TRUE; -} - -static gboolean -mate_panel_applet_can_focus (GtkWidget *widget) -{ - /* - * A MatePanelApplet widget can focus if it has a tooltip or it does - * not have any focusable children. - */ - if (gtk_widget_get_has_tooltip (widget)) - return TRUE; - - if (!PANEL_IS_APPLET (widget)) - return FALSE; - - return !container_has_focusable_child (GTK_CONTAINER (widget)); -} - -static gboolean -mate_panel_applet_button_press (GtkWidget *widget, - GdkEventButton *event) -{ - MatePanelApplet *applet = MATE_PANEL_APPLET (widget); - - if (!container_has_focusable_child (GTK_CONTAINER (applet))) { - if (!gtk_widget_has_focus (widget)) { - gtk_widget_set_can_focus (widget, TRUE); - gtk_widget_grab_focus (widget); - } - } - - if (event->button == 1) - return TRUE; - else if (event->button == 3) { - matecomponent_control_do_popup_full ( - applet->priv->control, - NULL, NULL, - (GtkMenuPositionFunc) mate_panel_applet_position_menu, - applet, - event->button, - event->time); - return TRUE; - } - - return FALSE; -} - -gboolean -_mate_panel_applet_popup_menu (MatePanelApplet *applet, - guint button, - guint32 time) -{ - matecomponent_control_do_popup_full (applet->priv->control, NULL, NULL, - (GtkMenuPositionFunc) mate_panel_applet_position_menu, - applet, button, time); - return TRUE; -} - -static gboolean -mate_panel_applet_popup_menu (MatePanelApplet *applet) -{ - return _mate_panel_applet_popup_menu (applet, 3, GDK_CURRENT_TIME); -} - -static void -mate_panel_applet_size_request (GtkWidget *widget, GtkRequisition *requisition) -{ - int focus_width = 0; - - GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->size_request (widget, - requisition); - - if (!mate_panel_applet_can_focus (widget)) - return; - - /* - * We are deliberately ignoring focus-padding here to - * save valuable panel real estate. - */ - gtk_widget_style_get (widget, - "focus-line-width", &focus_width, - NULL); - - requisition->width += 2 * focus_width; - requisition->height += 2 * focus_width; -} - -static void -mate_panel_applet_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkAllocation child_allocation; - GtkBin *bin; - GtkWidget *child; - int border_width; - int focus_width = 0; - MatePanelApplet *applet; - - if (!mate_panel_applet_can_focus (widget)) { - GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->size_allocate (widget, allocation); - } else { - /* - * We are deliberately ignoring focus-padding here to - * save valuable panel real estate. - */ - gtk_widget_style_get (widget, - "focus-line-width", &focus_width, - NULL); - - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - - gtk_widget_set_allocation (widget, allocation); - bin = GTK_BIN (widget); - - child_allocation.x = focus_width; - child_allocation.y = focus_width; - - child_allocation.width = MAX (allocation->width - border_width * 2, 0); - child_allocation.height = MAX (allocation->height - border_width * 2, 0); - - if (gtk_widget_get_realized (widget)) - gdk_window_move_resize (gtk_widget_get_window (widget), - allocation->x + border_width, - allocation->y + border_width, - child_allocation.width, - child_allocation.height); - - child_allocation.width = MAX (child_allocation.width - 2 * focus_width, 0); - child_allocation.height = MAX (child_allocation.height - 2 * focus_width, 0); - - child = gtk_bin_get_child (bin); - if (child) - gtk_widget_size_allocate (child, &child_allocation); - } - - applet = MATE_PANEL_APPLET (widget); - - if (applet->priv->previous_height != allocation->height || - applet->priv->previous_width != allocation->width) { - applet->priv->previous_height = allocation->height; - applet->priv->previous_width = allocation->width; - - mate_panel_applet_handle_background (applet); - } -} - -static gboolean -mate_panel_applet_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkAllocation allocation; - int border_width; - int focus_width = 0; - int x, y, width, height; - - g_return_val_if_fail (PANEL_IS_APPLET (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->expose_event (widget, event); - - if (!gtk_widget_has_focus (widget)) - return FALSE; - - gtk_widget_get_allocation (widget, &allocation); - - /* - * We are deliberately ignoring focus-padding here to - * save valuable panel real estate. - */ - gtk_widget_style_get (widget, - "focus-line-width", &focus_width, - NULL); - - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - - x = allocation.x; - y = allocation.y; - - width = allocation.width - 2 * border_width; - height = allocation.height - 2 * border_width; - - gtk_paint_focus (gtk_widget_get_style (widget), - gtk_widget_get_window (widget), - gtk_widget_get_state (widget), - &event->area, widget, "mate_panel_applet", - x, y, width, height); - - return FALSE; -} - -static gboolean -mate_panel_applet_focus (GtkWidget *widget, - GtkDirectionType dir) -{ - gboolean ret; - GtkWidget *previous_focus_child; - MatePanelApplet *applet; - - g_return_val_if_fail (PANEL_IS_APPLET (widget), FALSE); - - applet = MATE_PANEL_APPLET (widget); - if (applet->priv->moving_focus_out) { - /* - * Applet will retain focus if there is nothing else on the - * panel to get focus - */ - applet->priv->moving_focus_out = FALSE; - return FALSE; - } - - previous_focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget)); - if (!previous_focus_child && !gtk_widget_has_focus (widget)) { - if (gtk_widget_get_has_tooltip (widget)) { - gtk_widget_set_can_focus (widget, TRUE); - gtk_widget_grab_focus (widget); - gtk_widget_set_can_focus (widget, FALSE); - return TRUE; - } - } - ret = GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->focus (widget, dir); - - if (!ret && !previous_focus_child) { - if (!gtk_widget_has_focus (widget)) { - /* - * Applet does not have a widget which can focus so set - * the focus on the applet unless it already had focus - * because it had a tooltip. - */ - gtk_widget_set_can_focus (widget, TRUE); - gtk_widget_grab_focus (widget); - gtk_widget_set_can_focus (widget, FALSE); - ret = TRUE; - } - } - - return ret; -} - -static gboolean -mate_panel_applet_parse_color (const gchar *color_str, - GdkColor *color) -{ - int r, g, b; - - g_assert (color_str && color); - - if (sscanf (color_str, "%4x%4x%4x", &r, &g, &b) != 3) - return FALSE; - - color->red = r; - color->green = g; - color->blue = b; - - return TRUE; -} - -static gboolean -mate_panel_applet_parse_pixmap_str (const char *str, - GdkNativeWindow *xid, - int *x, - int *y) -{ - char **elements; - char *tmp; - - g_return_val_if_fail (str != NULL, FALSE); - g_return_val_if_fail (xid != NULL, FALSE); - g_return_val_if_fail (x != NULL, FALSE); - g_return_val_if_fail (y != NULL, FALSE); - - elements = g_strsplit (str, ",", -1); - - if (!elements) - return FALSE; - - if (!elements [0] || !*elements [0] || - !elements [1] || !*elements [1] || - !elements [2] || !*elements [2]) - goto ERROR_AND_FREE; - - *xid = strtol (elements [0], &tmp, 10); - if (tmp == elements [0]) - goto ERROR_AND_FREE; - - *x = strtol (elements [1], &tmp, 10); - if (tmp == elements [1]) - goto ERROR_AND_FREE; - - *y = strtol (elements [2], &tmp, 10); - if (tmp == elements [2]) - goto ERROR_AND_FREE; - - g_strfreev (elements); - return TRUE; - - ERROR_AND_FREE: - g_strfreev (elements); - return FALSE; -} - -static GdkPixmap * -mate_panel_applet_get_pixmap (MatePanelApplet *applet, - GdkNativeWindow xid, - int x, - int y) -{ - gboolean display_grabbed; - GdkPixmap *pixmap; - GdkDisplay *display; - GdkPixmap *retval; - GdkWindow *window; - int width; - int height; - cairo_t *cr; - cairo_pattern_t *pattern; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), NULL); - - if (!gtk_widget_get_realized (GTK_WIDGET (applet))) - return NULL; - - display = gdk_display_get_default (); - display_grabbed = FALSE; - - window = gtk_widget_get_window (GTK_WIDGET (applet)); - - pixmap = gdk_pixmap_lookup_for_display (display, xid); - if (pixmap) - g_object_ref (pixmap); - else { - display_grabbed = TRUE; - gdk_x11_display_grab (display); - pixmap = gdk_pixmap_foreign_new_for_display (display, xid); - } - - /* This can happen if the user changes the background very fast. - * We'll get the next update, so it's not a big deal. */ - if (pixmap == NULL) { - if (display_grabbed) - gdk_x11_display_ungrab (display); - return NULL; - } - - #if GTK_CHECK_VERSION(3, 0, 0) - width = gdk_window_get_width(window); - height = gdk_window_get_height(window); - #else - gdk_drawable_get_size(GDK_DRAWABLE(window), &width, &height); - #endif - - retval = gdk_pixmap_new (window, - width, height, -1); - - /* the pixmap has no colormap, and we need one */ - gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), - gdk_drawable_get_colormap (window)); - - cr = gdk_cairo_create (GDK_DRAWABLE (retval)); - gdk_cairo_set_source_pixmap (cr, pixmap, -x, -y); - pattern = cairo_get_source (cr); - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - - cairo_rectangle (cr, 0, 0, width, height); - cairo_fill (cr); - - cairo_destroy (cr); - - g_object_unref (pixmap); - - if (display_grabbed) - gdk_x11_display_ungrab (display); - - return retval; -} - -static MatePanelAppletBackgroundType -mate_panel_applet_handle_background_string (MatePanelApplet *applet, - GdkColor *color, - GdkPixmap **pixmap) -{ - MatePanelAppletBackgroundType retval; - char **elements; - - retval = PANEL_NO_BACKGROUND; - - if (!gtk_widget_get_realized (GTK_WIDGET (applet)) || !applet->priv->background) - return retval; - - elements = g_strsplit (applet->priv->background, ":", -1); - - if (elements [0] && !strcmp (elements [0], "none" )) { - retval = PANEL_NO_BACKGROUND; - - } else if (elements [0] && !strcmp (elements [0], "color")) { - g_return_val_if_fail (color != NULL, PANEL_NO_BACKGROUND); - - if (!elements [1] || !mate_panel_applet_parse_color (elements [1], color)) { - - g_warning ("Incomplete '%s' background type received", elements [0]); - g_strfreev (elements); - return PANEL_NO_BACKGROUND; - } - - retval = PANEL_COLOR_BACKGROUND; - - } else if (elements [0] && !strcmp (elements [0], "pixmap")) { - GdkNativeWindow pixmap_id; - int x, y; - - g_return_val_if_fail (pixmap != NULL, PANEL_NO_BACKGROUND); - - if (!mate_panel_applet_parse_pixmap_str (elements [1], &pixmap_id, &x, &y)) { - g_warning ("Incomplete '%s' background type received: %s", - elements [0], elements [1]); - - g_strfreev (elements); - return PANEL_NO_BACKGROUND; - } - - *pixmap = mate_panel_applet_get_pixmap (applet, pixmap_id, x, y); - if (!*pixmap) { - g_warning ("Failed to get pixmap %s", elements [1]); - g_strfreev (elements); - return PANEL_NO_BACKGROUND; - } - - retval = PANEL_PIXMAP_BACKGROUND; - } else - g_warning ("Unknown background type received"); - - g_strfreev (elements); - - return retval; -} - -MatePanelAppletBackgroundType -mate_panel_applet_get_background (MatePanelApplet *applet, - GdkColor *color, - GdkPixmap **pixmap) -{ - g_return_val_if_fail (PANEL_IS_APPLET (applet), PANEL_NO_BACKGROUND); - - /* initial sanity */ - if (pixmap != NULL) - *pixmap = NULL; - if (color != NULL) - memset (color, 0, sizeof (GdkColor)); - - return mate_panel_applet_handle_background_string (applet, color, pixmap); -} - -static void -mate_panel_applet_get_prop (MateComponentPropertyBag *sack, - MateComponentArg *arg, - guint arg_id, - CORBA_Environment *ev, - gpointer user_data) -{ - MatePanelApplet *applet = MATE_PANEL_APPLET (user_data); - - switch (arg_id) { - case PROPERTY_ORIENT_IDX: - MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->orient); - break; - case PROPERTY_SIZE_IDX: - MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->size); - break; - case PROPERTY_BACKGROUND_IDX: - MATECOMPONENT_ARG_SET_STRING (arg, applet->priv->background); - break; - case PROPERTY_FLAGS_IDX: - MATECOMPONENT_ARG_SET_SHORT (arg, applet->priv->flags); - break; - case PROPERTY_SIZE_HINTS_IDX: { - CORBA_sequence_CORBA_long *seq; - int i; - - seq = arg->_value; - - seq->_length = seq->_maximum = applet->priv->size_hints_len; - seq->_buffer = CORBA_sequence_CORBA_long_allocbuf (seq->_length); - seq->_release = CORBA_TRUE; - - for (i = 0; i < applet->priv->size_hints_len; i++) - seq->_buffer [i] = applet->priv->size_hints [i]; - } - break; - case PROPERTY_LOCKED_DOWN_IDX: - MATECOMPONENT_ARG_SET_BOOLEAN (arg, applet->priv->locked_down); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -mate_panel_applet_update_background_for_widget (GtkWidget *widget, - MatePanelAppletBackgroundType type, - GdkColor *color, - GdkPixmap *pixmap) -{ - GtkRcStyle *rc_style; - GtkStyle *style; - - /* reset style */ - gtk_widget_set_style (widget, NULL); - rc_style = gtk_rc_style_new (); - gtk_widget_modify_style (widget, rc_style); - g_object_unref (rc_style); - - switch (type) { - case PANEL_NO_BACKGROUND: - break; - case PANEL_COLOR_BACKGROUND: - gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, color); - break; - case PANEL_PIXMAP_BACKGROUND: - style = gtk_style_copy (gtk_widget_get_style (widget)); - if (style->bg_pixmap[GTK_STATE_NORMAL]) - g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); - style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); - gtk_widget_set_style (widget, style); - g_object_unref (style); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -mate_panel_applet_handle_background (MatePanelApplet *applet) -{ - MatePanelAppletBackgroundType type; - GdkColor color; - GdkPixmap *pixmap; - - type = mate_panel_applet_get_background (applet, &color, &pixmap); - - if (applet->priv->background_widget) - mate_panel_applet_update_background_for_widget (applet->priv->background_widget, - type, &color, pixmap); - - switch (type) { - case PANEL_NO_BACKGROUND: - g_signal_emit (G_OBJECT (applet), - mate_panel_applet_signals [CHANGE_BACKGROUND], - 0, PANEL_NO_BACKGROUND, NULL, NULL); - break; - case PANEL_COLOR_BACKGROUND: - g_signal_emit (G_OBJECT (applet), - mate_panel_applet_signals [CHANGE_BACKGROUND], - 0, PANEL_COLOR_BACKGROUND, &color, NULL); - break; - case PANEL_PIXMAP_BACKGROUND: - g_signal_emit (G_OBJECT (applet), - mate_panel_applet_signals [CHANGE_BACKGROUND], - 0, PANEL_PIXMAP_BACKGROUND, NULL, pixmap); - - g_object_unref (pixmap); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -mate_panel_applet_set_prop (MateComponentPropertyBag *sack, - const MateComponentArg *arg, - guint arg_id, - CORBA_Environment *ev, - gpointer user_data) -{ - MatePanelApplet *applet = MATE_PANEL_APPLET (user_data); - - switch (arg_id) { - case PROPERTY_ORIENT_IDX: { - MatePanelAppletOrient orient; - - orient = MATECOMPONENT_ARG_GET_SHORT (arg); - - if (applet->priv->orient != orient) { - applet->priv->orient = orient; - - g_signal_emit (G_OBJECT (applet), - mate_panel_applet_signals [CHANGE_ORIENT], - 0, orient); - } - } - break; - case PROPERTY_SIZE_IDX: { - guint size; - - size = MATECOMPONENT_ARG_GET_SHORT (arg); - - if (applet->priv->size != size) { - applet->priv->size = size; - - g_signal_emit (G_OBJECT (applet), - mate_panel_applet_signals [CHANGE_SIZE], - 0, size); - } - } - break; - case PROPERTY_BACKGROUND_IDX: - if (applet->priv->background) - g_free (applet->priv->background); - - applet->priv->background = g_strdup (MATECOMPONENT_ARG_GET_STRING (arg)); - - mate_panel_applet_handle_background (applet); - break; - case PROPERTY_FLAGS_IDX: - applet->priv->flags = MATECOMPONENT_ARG_GET_SHORT (arg); - break; - case PROPERTY_SIZE_HINTS_IDX: { - CORBA_sequence_CORBA_long *seq = arg->_value; - int i; - - applet->priv->size_hints = g_realloc (applet->priv->size_hints, - seq->_length * sizeof (int)); - for (i = 0; i < seq->_length; i++) - applet->priv->size_hints [i] = seq->_buffer [i]; - - applet->priv->size_hints_len = seq->_length;; - } - break; - case PROPERTY_LOCKED_DOWN_IDX: - applet->priv->locked_down = MATECOMPONENT_ARG_GET_BOOLEAN (arg); - break; - default: - g_assert_not_reached (); - break; - } -} - -static MateComponentPropertyBag * -mate_panel_applet_property_bag (MatePanelApplet *applet) -{ - MateComponentPropertyBag *sack; - - sack = matecomponent_property_bag_new (mate_panel_applet_get_prop, - mate_panel_applet_set_prop, - applet); - - matecomponent_property_bag_add (sack, - PROPERTY_ORIENT, - PROPERTY_ORIENT_IDX, - MATECOMPONENT_ARG_SHORT, - NULL, - "The Applet's containing Panel's orientation", - MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE); - - matecomponent_property_bag_add (sack, - PROPERTY_SIZE, - PROPERTY_SIZE_IDX, - MATECOMPONENT_ARG_SHORT, - NULL, - "The Applet's containing Panel's size in pixels", - MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE); - - matecomponent_property_bag_add (sack, - PROPERTY_BACKGROUND, - PROPERTY_BACKGROUND_IDX, - MATECOMPONENT_ARG_STRING, - NULL, - "The Applet's containing Panel's background color or pixmap", - MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE); - - matecomponent_property_bag_add (sack, - PROPERTY_FLAGS, - PROPERTY_FLAGS_IDX, - MATECOMPONENT_ARG_SHORT, - NULL, - "The Applet's flags", - MateComponent_PROPERTY_READABLE); - - matecomponent_property_bag_add (sack, - PROPERTY_SIZE_HINTS, - PROPERTY_SIZE_HINTS_IDX, - TC_CORBA_sequence_CORBA_long, - NULL, - "Ranges that hint what sizes are acceptable for the applet", - MateComponent_PROPERTY_READABLE); - - matecomponent_property_bag_add (sack, - PROPERTY_LOCKED_DOWN, - PROPERTY_LOCKED_DOWN_IDX, - MATECOMPONENT_ARG_BOOLEAN, - NULL, - "The Applet's containing Panel is locked down", - MateComponent_PROPERTY_READABLE | MateComponent_PROPERTY_WRITEABLE); - - return sack; -} - -static void -mate_panel_applet_realize (GtkWidget *widget) -{ - GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->realize (widget); - - if (MATE_PANEL_APPLET (widget)->priv->background) - mate_panel_applet_handle_background (MATE_PANEL_APPLET (widget)); -} - -static void -mate_panel_applet_control_bound (MateComponentControl *control, - MatePanelApplet *applet) -{ - gboolean ret; - - g_return_if_fail (PANEL_IS_APPLET (applet)); - g_return_if_fail (applet->priv->iid != NULL && - applet->priv->closure != NULL); - - if (applet->priv->bound) - return; - - matecomponent_closure_invoke (applet->priv->closure, - G_TYPE_BOOLEAN, &ret, - PANEL_TYPE_APPLET, applet, - G_TYPE_STRING, applet->priv->iid, - NULL); - - - if (!ret) { /* FIXME */ - g_warning ("need to free the control here"); - - return; - } - - applet->priv->bound = TRUE; -} - -static MateComponent_Unknown -mate_panel_applet_item_handler_get_object (MateComponentItemHandler *handler, - const char *item_name, - gboolean only_if_exists, - gpointer user_data, - CORBA_Environment *ev) -{ - MatePanelApplet *applet = user_data; - GSList *options; - GSList *l; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), CORBA_OBJECT_NIL); - - options = matecomponent_item_option_parse (item_name); - - for (l = options; l; l = l->next) { - MateComponentItemOption *option = l->data; - - if (!option->value || !option->value [0]) - continue; - - if (!strcmp (option->key, "prefs_key") && !applet->priv->prefs_key) - mate_panel_applet_set_preferences_key (applet, option->value); - - else if (!strcmp (option->key, "background")) - matecomponent_pbclient_set_string (MATECOMPONENT_OBJREF (applet->priv->prop_sack), - PROPERTY_BACKGROUND, option->value, NULL); - - else if (!strcmp (option->key, "orient")) { - if (!strcmp (option->value, "up")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT, - MATE_PANEL_APPLET_ORIENT_UP, NULL); - - else if (!strcmp (option->value, "down")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT, - MATE_PANEL_APPLET_ORIENT_DOWN, NULL); - - else if (!strcmp (option->value, "left")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT, - MATE_PANEL_APPLET_ORIENT_LEFT, NULL); - - else if (!strcmp (option->value, "right")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_ORIENT, - MATE_PANEL_APPLET_ORIENT_RIGHT, NULL); - - } else if (!strcmp (option->key, "size")) { - if (!strcmp (option->value, "xx-small")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_XX_SMALL, NULL); - - else if (!strcmp (option->value, "x-small")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_X_SMALL, NULL); - - else if (!strcmp (option->value, "small")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_SMALL, NULL); - - else if (!strcmp (option->value, "medium")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_MEDIUM, NULL); - - else if (!strcmp (option->value, "large")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_LARGE, NULL); - - else if (!strcmp (option->value, "x-large")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_X_LARGE, NULL); - - else if (!strcmp (option->value, "xx-large")) - matecomponent_pbclient_set_short ( - MATECOMPONENT_OBJREF (applet->priv->prop_sack), PROPERTY_SIZE, - MATE_Vertigo_PANEL_XX_LARGE, NULL); - } else if (!strcmp (option->key, "locked_down")) { - gboolean val = FALSE; - if (option->value[0] == 'T' || - option->value[0] == 't' || - option->value[0] == 'Y' || - option->value[0] == 'y' || - atoi (option->value) != 0) - val = TRUE; - matecomponent_pbclient_set_boolean (MATECOMPONENT_OBJREF (applet->priv->prop_sack), - PROPERTY_LOCKED_DOWN, val, NULL); - } - } - - matecomponent_item_options_free (options); - - return matecomponent_object_dup_ref (MATECOMPONENT_OBJREF (applet->priv->control), ev); -} - -static void -mate_panel_applet_move_focus_out_of_applet (MatePanelApplet *applet, - GtkDirectionType dir) -{ - GtkWidget *toplevel; - - applet->priv->moving_focus_out = TRUE; - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (applet)); - g_return_if_fail (toplevel); - - gtk_widget_child_focus (toplevel, dir); - applet->priv->moving_focus_out = FALSE; -} - -static void -add_tab_bindings (GtkBindingSet *binding_set, - GdkModifierType modifiers, - GtkDirectionType direction) -{ - gtk_binding_entry_add_signal (binding_set, GDK_Tab, modifiers, - "move_focus_out_of_applet", 1, - GTK_TYPE_DIRECTION_TYPE, direction); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, modifiers, - "move_focus_out_of_applet", 1, - GTK_TYPE_DIRECTION_TYPE, direction); -} - -static GObject* mate_panel_applet_constructor(GType type, guint n_construct_properties, GObjectConstructParam *construct_properties) -{ - GObject* obj = G_OBJECT_CLASS(mate_panel_applet_parent_class)->constructor(type, n_construct_properties, construct_properties); - - MatePanelApplet* applet = MATE_PANEL_APPLET(obj); - - /* Voy a renombrar la clase para que se pueda tener compatibilidad con todos - * los estilos visuales de GTK2 - * - * Issue #27 - */ - gtk_widget_set_name(GTK_WIDGET(applet), "PanelApplet"); - - mate_panel_applet_setup(applet); - - return obj; -} - -static void -mate_panel_applet_class_init (MatePanelAppletClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - GtkObjectClass *object_class = (GtkObjectClass *) klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *) klass; - GtkBindingSet *binding_set; - - gobject_class->constructor = mate_panel_applet_constructor; - klass->move_focus_out_of_applet = mate_panel_applet_move_focus_out_of_applet; - - widget_class->button_press_event = mate_panel_applet_button_press; - widget_class->size_request = mate_panel_applet_size_request; - widget_class->size_allocate = mate_panel_applet_size_allocate; - widget_class->expose_event = mate_panel_applet_expose; - widget_class->focus = mate_panel_applet_focus; - widget_class->realize = mate_panel_applet_realize; - - gobject_class->finalize = mate_panel_applet_finalize; - - g_type_class_add_private (klass, sizeof (MatePanelAppletPrivate)); - - mate_panel_applet_signals [CHANGE_ORIENT] = - g_signal_new ("change_orient", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (MatePanelAppletClass, change_orient), - NULL, - NULL, - mate_panel_applet_marshal_VOID__UINT, - G_TYPE_NONE, - 1, - G_TYPE_UINT); - - mate_panel_applet_signals [CHANGE_SIZE] = - g_signal_new ("change_size", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (MatePanelAppletClass, change_size), - NULL, - NULL, - mate_panel_applet_marshal_VOID__INT, - G_TYPE_NONE, - 1, - G_TYPE_INT); - - mate_panel_applet_signals [CHANGE_BACKGROUND] = - g_signal_new ("change_background", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (MatePanelAppletClass, change_background), - NULL, - NULL, - mate_panel_applet_marshal_VOID__ENUM_BOXED_OBJECT, - G_TYPE_NONE, - 3, - PANEL_TYPE_MATE_PANEL_APPLET_BACKGROUND_TYPE, - GDK_TYPE_COLOR, - GDK_TYPE_PIXMAP); - - mate_panel_applet_signals [MOVE_FOCUS_OUT_OF_APPLET] = - g_signal_new ("move_focus_out_of_applet", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (MatePanelAppletClass, move_focus_out_of_applet), - NULL, - NULL, - mate_panel_applet_marshal_VOID__ENUM, - G_TYPE_NONE, - 1, - GTK_TYPE_DIRECTION_TYPE); - - binding_set = gtk_binding_set_by_class (object_class); - add_tab_bindings (binding_set, 0, GTK_DIR_TAB_FORWARD); - add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD); - add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD); - add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD); -} - -static void -mate_panel_applet_init (MatePanelApplet *applet) -{ - applet->priv = MATE_PANEL_APPLET_GET_PRIVATE (applet); - - applet->priv->client = mateconf_client_get_default (); - - applet->priv->bound = FALSE; - applet->priv->flags = MATE_PANEL_APPLET_FLAGS_NONE; - applet->priv->orient = MATE_PANEL_APPLET_ORIENT_UP; - applet->priv->size = MATE_Vertigo_PANEL_MEDIUM; - - applet->priv->moving_focus_out = FALSE; - - gtk_widget_set_events (GTK_WIDGET (applet), - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); -} - -static void -mate_panel_applet_setup (MatePanelApplet *applet) -{ - MatePanelAppletPrivate *priv; - - priv = applet->priv; - - priv->control = matecomponent_control_new (GTK_WIDGET (applet)); - - g_signal_connect (priv->control, "set_frame", - G_CALLBACK (mate_panel_applet_control_bound), - applet); - - priv->prop_sack = mate_panel_applet_property_bag (applet); - - matecomponent_control_set_properties ( - priv->control, MATECOMPONENT_OBJREF (priv->prop_sack), NULL); - - priv->shell = mate_panel_applet_shell_new (applet); - - matecomponent_object_add_interface (MATECOMPONENT_OBJECT (priv->control), - MATECOMPONENT_OBJECT (priv->shell)); - - priv->item_handler = - matecomponent_item_handler_new ( - NULL, mate_panel_applet_item_handler_get_object, applet); - - matecomponent_object_add_interface (MATECOMPONENT_OBJECT (priv->control), - MATECOMPONENT_OBJECT (priv->item_handler)); - - g_signal_connect (applet, "popup_menu", - G_CALLBACK (mate_panel_applet_popup_menu), NULL); -} - -GtkWidget* mate_panel_applet_new(void) -{ - MatePanelApplet* applet = g_object_new(PANEL_TYPE_APPLET, NULL); - - return GTK_WIDGET (applet); -} - -typedef struct { - GType applet_type; - GClosure *closure; -} MatePanelAppletCallBackData; - -static MatePanelAppletCallBackData * -mate_panel_applet_callback_data_new (GType applet_type, - GClosure *closure) -{ - MatePanelAppletCallBackData *retval; - - retval = g_new0 (MatePanelAppletCallBackData, 1); - - retval->applet_type = applet_type; - retval->closure = closure; - - return retval; -} - -static void -mate_panel_applet_callback_data_free (MatePanelAppletCallBackData *data) -{ - g_closure_unref (data->closure); - g_free (data); -} - -static MateComponentObject * -mate_panel_applet_factory_callback (MateComponentGenericFactory *factory, - const char *iid, - MatePanelAppletCallBackData *data) -{ - MatePanelApplet *applet; - - applet = g_object_new (data->applet_type, NULL); - - applet->priv->iid = g_strdup (iid); - applet->priv->closure = g_closure_ref (data->closure); - - matecomponent_control_life_instrument (applet->priv->control); - - return MATECOMPONENT_OBJECT (applet->priv->control); -} - -static void -mate_panel_applet_all_controls_dead (void) -{ - if (!matecomponent_control_life_get_count()) - matecomponent_main_quit (); -} - -int -mate_panel_applet_factory_main_closure (const gchar *iid, - GType applet_type, - GClosure *closure) -{ - int retval; - char *display_iid; - MatePanelAppletCallBackData *data; - - g_return_val_if_fail (iid != NULL, 1); - g_return_val_if_fail (closure != NULL, 1); - - g_assert (g_type_is_a (applet_type, PANEL_TYPE_APPLET)); - - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - - matecomponent_control_life_set_callback (mate_panel_applet_all_controls_dead); - - closure = matecomponent_closure_store (closure, mate_panel_applet_marshal_BOOLEAN__STRING); - - data = mate_panel_applet_callback_data_new (applet_type, closure); - - display_iid = matecomponent_activation_make_registration_id ( - iid, DisplayString (gdk_display_get_default ())); - retval = matecomponent_generic_factory_main ( - display_iid, - (MateComponentFactoryCallback) mate_panel_applet_factory_callback, - data); - g_free (display_iid); - - mate_panel_applet_callback_data_free (data); - - return retval; -} - -int -mate_panel_applet_factory_main (const gchar *iid, - GType applet_type, - MatePanelAppletFactoryCallback callback, - gpointer data) -{ - GClosure *closure; - - g_return_val_if_fail (iid != NULL, 1); - g_return_val_if_fail (callback != NULL, 1); - - closure = g_cclosure_new (G_CALLBACK (callback), data, NULL); - - return mate_panel_applet_factory_main_closure (iid, applet_type, closure); -} - -void -mate_panel_applet_set_background_widget (MatePanelApplet *applet, - GtkWidget *widget) -{ - applet->priv->background_widget = widget; - - if (widget) { - MatePanelAppletBackgroundType type; - GdkColor color; - GdkPixmap *pixmap; - - type = mate_panel_applet_get_background (applet, &color, &pixmap); - mate_panel_applet_update_background_for_widget (widget, type, - &color, pixmap); - if (type == PANEL_PIXMAP_BACKGROUND) - g_object_unref (pixmap); - } -} diff --git a/matecomponent/libmate-panel-applet/mate-panel-applet.h b/matecomponent/libmate-panel-applet/mate-panel-applet.h deleted file mode 100644 index 3310fa32..00000000 --- a/matecomponent/libmate-panel-applet/mate-panel-applet.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - * mate-panel-applet.h: panel applet writing API. - * - * Copyright (C) 2001 Sun Microsystems, Inc. - * - * 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, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifndef __MATE_PANEL_APPLET_H__ -#define __MATE_PANEL_APPLET_H__ - -#include <glib.h> -#include <gtk/gtk.h> -#include <matecomponent/matecomponent-control.h> -#include <matecomponent/matecomponent-main.h> -#include <matecomponent/matecomponent-ui-component.h> -#include <matecomponent/matecomponent-generic-factory.h> - -#include <MATE_Panel.h> - -#ifdef __cplusplus -extern "C" { -#endif - -typedef MATE_Vertigo_PanelOrient MatePanelAppletOrient; - -#define MATE_PANEL_APPLET_ORIENT_UP MATE_Vertigo_PANEL_ORIENT_UP -#define MATE_PANEL_APPLET_ORIENT_DOWN MATE_Vertigo_PANEL_ORIENT_DOWN -#define MATE_PANEL_APPLET_ORIENT_LEFT MATE_Vertigo_PANEL_ORIENT_LEFT -#define MATE_PANEL_APPLET_ORIENT_RIGHT MATE_Vertigo_PANEL_ORIENT_RIGHT - - -#define PANEL_TYPE_APPLET (mate_panel_applet_get_type ()) -#define MATE_PANEL_APPLET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_APPLET, MatePanelApplet)) -#define MATE_PANEL_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_APPLET, MatePanelAppletClass)) -#define PANEL_IS_APPLET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_TYPE_APPLET)) -#define PANEL_IS_APPLET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PANEL_TYPE_APPLET)) -#define MATE_PANEL_APPLET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_TYPE_APPLET, MatePanelAppletClass)) - -typedef enum { - PANEL_NO_BACKGROUND, - PANEL_COLOR_BACKGROUND, - PANEL_PIXMAP_BACKGROUND -} MatePanelAppletBackgroundType; - -typedef enum { - MATE_PANEL_APPLET_FLAGS_NONE = 0, - MATE_PANEL_APPLET_EXPAND_MAJOR = 1 << 0, - MATE_PANEL_APPLET_EXPAND_MINOR = 1 << 1, - MATE_PANEL_APPLET_HAS_HANDLE = 1 << 2 -} MatePanelAppletFlags; - -typedef struct _MatePanelApplet MatePanelApplet; -typedef struct _MatePanelAppletClass MatePanelAppletClass; -typedef struct _MatePanelAppletPrivate MatePanelAppletPrivate; - -typedef gboolean (*MatePanelAppletFactoryCallback) (MatePanelApplet *applet, - const gchar *iid, - gpointer user_data); - -struct _MatePanelApplet { - GtkEventBox event_box; - - MatePanelAppletPrivate *priv; -}; - -struct _MatePanelAppletClass { - GtkEventBoxClass event_box_class; - - void (*change_orient) (MatePanelApplet *applet, - MatePanelAppletOrient orient); - - void (*change_size) (MatePanelApplet *applet, - guint size); - - void (*change_background) (MatePanelApplet *applet, - MatePanelAppletBackgroundType type, - GdkColor *color, - GdkPixmap *pixmap); - void (*move_focus_out_of_applet) (MatePanelApplet *frame, - GtkDirectionType direction); -}; - -GType mate_panel_applet_get_type (void) G_GNUC_CONST; - -GtkWidget* mate_panel_applet_new(void); - -MatePanelAppletOrient mate_panel_applet_get_orient (MatePanelApplet *applet); - -guint mate_panel_applet_get_size (MatePanelApplet *applet); - -MatePanelAppletBackgroundType - mate_panel_applet_get_background (MatePanelApplet *applet, - /* return values */ - GdkColor *color, - GdkPixmap **pixmap); - -void mate_panel_applet_set_background_widget (MatePanelApplet *applet, - GtkWidget *widget); - -gchar *mate_panel_applet_get_preferences_key (MatePanelApplet *applet); - -void mate_panel_applet_add_preferences (MatePanelApplet *applet, - const gchar *schema_dir, - GError **opt_error); - -MatePanelAppletFlags mate_panel_applet_get_flags (MatePanelApplet *applet); -void mate_panel_applet_set_flags (MatePanelApplet *applet, - MatePanelAppletFlags flags); - -void mate_panel_applet_set_size_hints (MatePanelApplet *applet, - const int *size_hints, - int n_elements, - int base_size); - -gboolean mate_panel_applet_get_locked_down (MatePanelApplet *applet); - -void mate_panel_applet_request_focus (MatePanelApplet *applet, - guint32 timestamp); - -MateComponentControl *mate_panel_applet_get_control (MatePanelApplet *applet); -MateComponentUIComponent *mate_panel_applet_get_popup_component (MatePanelApplet *applet); - -void mate_panel_applet_setup_menu (MatePanelApplet *applet, - const gchar *xml, - const MateComponentUIVerb *verb_list, - gpointer user_data); - -void mate_panel_applet_setup_menu_from_file (MatePanelApplet *applet, - const gchar *opt_datadir, - const gchar *file, - const gchar *opt_app_name, - const MateComponentUIVerb *verb_list, - gpointer user_data); - - -int mate_panel_applet_factory_main (const gchar *iid, - GType applet_type, - MatePanelAppletFactoryCallback callback, - gpointer data); - -int mate_panel_applet_factory_main_closure (const gchar *iid, - GType applet_type, - GClosure *closure); - -/* - * These macros are getting a bit unwieldy. - * - * Things to define for these: - * + required if Native Language Support is enabled (ENABLE_NLS): - * GETTEXT_PACKAGE and MATELOCALEDIR - */ - -#if !defined(ENABLE_NLS) -#define _MATE_PANEL_APPLET_SETUP_GETTEXT(call_textdomain) \ - do { } while (0) -#else /* defined(ENABLE_NLS) */ -#include <libintl.h> -#define _MATE_PANEL_APPLET_SETUP_GETTEXT(call_textdomain) \ - do { \ - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); \ - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); \ - if (call_textdomain) \ - textdomain (GETTEXT_PACKAGE); \ - } while (0) -#endif /* !defined(ENABLE_NLS) */ - -#define MATE_PANEL_APPLET_MATECOMPONENT_FACTORY(iid, type, name, version, callback, data) \ -int main (int argc, char *argv []) \ -{ \ - GOptionContext *context; \ - GError *error; \ - int retval; \ - \ - _MATE_PANEL_APPLET_SETUP_GETTEXT (TRUE); \ - \ - context = g_option_context_new (""); \ - g_option_context_add_group (context, gtk_get_option_group (TRUE)); \ - g_option_context_add_group (context, \ - matecomponent_activation_get_goption_group ()); \ - \ - error = NULL; \ - if (!g_option_context_parse (context, &argc, &argv, &error)) { \ - if (error) { \ - g_printerr ("Cannot parse arguments: %s.\n", \ - error->message); \ - g_error_free (error); \ - } else \ - g_printerr ("Cannot parse arguments.\n"); \ - g_option_context_free (context); \ - return 1; \ - } \ - \ - gtk_init (&argc, &argv); \ - if (!matecomponent_init (&argc, argv)) { \ - g_printerr ("Cannot initialize matecomponent.\n"); \ - return 1; \ - } \ - \ - retval = mate_panel_applet_factory_main (iid, type, callback, data); \ - g_option_context_free (context); \ - \ - return retval; \ -} - -#ifdef __cplusplus -} -#endif - -#endif /* __MATE_PANEL_APPLET_H__ */ diff --git a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c deleted file mode 100644 index 7c0da952..00000000 --- a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.c +++ /dev/null @@ -1,349 +0,0 @@ -/* - * panel-test-applets.c: - * - * Authors: - * Mark McLoughlin <[email protected]> - * - * Copyright 2002 Sun Microsystems, Inc. - */ - -#include <config.h> -#include <glib/gi18n.h> -#include <gtk/gtk.h> -#include <matecomponent/matecomponent-exception.h> -#include <matecomponent/matecomponent-main.h> -#include <matecomponent/matecomponent-widget.h> -#include <mateconf/mateconf.h> - -#include "mate-panel-applet.h" - -G_GNUC_UNUSED void on_execute_button_clicked (GtkButton *button, gpointer dummy); - -static GtkWidget *win = NULL; -static GtkWidget *applet_combo = NULL; -static GtkWidget *prefs_dir_entry = NULL; -static GtkWidget *orient_combo = NULL; -static GtkWidget *size_combo = NULL; - -static char *cli_iid = NULL; -static char *cli_prefs_dir = NULL; -static char *cli_size = NULL; -static char *cli_orient = NULL; - -static const GOptionEntry options [] = { - { "iid", 0, 0, G_OPTION_ARG_STRING, &cli_iid, N_("Specify an applet IID to load"), NULL}, - { "prefs-dir", 0, 0, G_OPTION_ARG_STRING, &cli_prefs_dir, N_("Specify a mateconf location in which the applet preferences should be stored"), NULL}, - { "size", 0, 0, G_OPTION_ARG_STRING, &cli_size, N_("Specify the initial size of the applet (xx-small, medium, large etc.)"), NULL}, - { "orient", 0, 0, G_OPTION_ARG_STRING, &cli_orient, N_("Specify the initial orientation of the applet (top, bottom, left or right)"), NULL}, - { NULL} -}; - -enum { - COLUMN_TEXT, - COLUMN_ITEM, - NUMBER_COLUMNS -}; - -typedef struct { - const char *name; - const char *value; -} ComboItem; - -static ComboItem orient_items [] = { - { NC_("Orientation", "Top"), "top" }, - { NC_("Orientation", "Bottom"), "bottom" }, - { NC_("Orientation", "Left"), "left" }, - { NC_("Orientation", "Right"), "right" } -}; - - -static ComboItem size_items [] = { - { NC_("Size", "XX Small"), "xx-small" }, - { NC_("Size", "X Small"), "x-small" }, - { NC_("Size", "Small"), "small" }, - { NC_("Size", "Medium"), "medium" }, - { NC_("Size", "Large"), "large" }, - { NC_("Size", "X Large"), "x-large" }, - { NC_("Size", "XX Large"), "xx-large" } -}; - -static char * -get_combo_value (GtkWidget *combo_box) -{ - GtkTreeIter iter; - GtkTreeModel *model; - char *value; - - if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter)) - return NULL; - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo_box)); - gtk_tree_model_get (model, &iter, COLUMN_ITEM, &value, -1); - - return value; -} - -static char * -construct_moniker (void) -{ - const char *prefs_key; - char *iid; - char *size; - char *orient; - char *ret_value; - - iid = get_combo_value (applet_combo); - g_assert (iid != NULL); - size = get_combo_value (size_combo); - g_assert (size != NULL); - orient = get_combo_value (orient_combo); - g_assert (orient != NULL); - - prefs_key = gtk_entry_get_text (GTK_ENTRY (prefs_dir_entry)); - - ret_value= g_strdup_printf ("%s!prefs_key=%s;size=%s;orient=%s", - iid, prefs_key, size, orient); - g_free (iid); - g_free (size); - g_free (orient); - - return ret_value; -} - -static void -load_applet_into_window (const char *moniker, - const char *title) -{ - GtkWidget *applet_window; - GtkWidget *applet; - - applet = matecomponent_widget_new_control (moniker, NULL); - - if (!applet) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (win ? GTK_WINDOW (win) : NULL, - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Failed to load applet %s"), - title); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - return; - } - - applet_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - - gtk_widget_show (applet); - - gtk_container_add (GTK_CONTAINER (applet_window), applet); - - //FIXME: we could set the window icon with the applet icon - gtk_window_set_title (GTK_WINDOW (applet_window), title); - gtk_widget_show (applet_window); -} - -static void -load_applet_from_command_line (void) -{ - GString *str; - - g_assert (cli_iid != NULL); - - str = g_string_new (cli_iid); - - if (cli_prefs_dir || cli_size || cli_orient) { - g_string_append_c (str, '!'); - - if (cli_prefs_dir) - g_string_append_printf (str, "prefs_key=%s", cli_prefs_dir); - - g_string_append_c (str, ';'); - - if (cli_size) - g_string_append_printf (str, "size=%s", cli_size); - - g_string_append_c (str, ';'); - - if (cli_orient) - g_string_append_printf (str, "orient=%s", cli_orient); - } - - g_print ("Loading %s\n", str->str); - - load_applet_into_window (str->str, cli_iid); - - g_string_free (str, TRUE); -} - -G_GNUC_UNUSED void -on_execute_button_clicked (GtkButton *button, - gpointer dummy) -{ - char *moniker; - char *title; - - moniker = construct_moniker (); - title = get_combo_value (applet_combo); - load_applet_into_window (moniker, title); - g_free (moniker); - g_free (title); -} - -static void -setup_combo (GtkWidget *combo_box, - ComboItem *items, - const char *context, - int nb_items, - gboolean dynamic) -{ - GtkListStore *model; - GtkTreeIter iter; - GtkCellRenderer *renderer; - int i; - - model = gtk_list_store_new (NUMBER_COLUMNS, - G_TYPE_STRING, - G_TYPE_STRING); - - gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), - GTK_TREE_MODEL (model)); - - - for (i = 0; i < nb_items; i++) { - gtk_list_store_append (model, &iter); - gtk_list_store_set (model, &iter, - COLUMN_TEXT, dynamic ? g_strdup (items [i].name) : g_dpgettext2 (NULL, context, items [i].name), - COLUMN_ITEM, dynamic ? g_strdup (items [i].value) : items [i].value, - -1); - } - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), - renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), - renderer, "text", COLUMN_TEXT, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0); -} - -static void -setup_options (void) -{ - MateComponent_ServerInfoList *applets; - CORBA_Environment env; - int i; - char *prefs_dir; - char *unique_key; - ComboItem *applet_items; - int applet_nb; - - CORBA_exception_init (&env); - - applets = matecomponent_activation_query ( - "has (repo_ids, 'IDL:MATE/Vertigo/MatePanelAppletShell:1.0')", - NULL, &env); - - if (MATECOMPONENT_EX (&env)) - g_error (_("query returned exception %s\n"), MATECOMPONENT_EX_REPOID (&env)); - - CORBA_exception_free (&env); - - applet_nb = applets->_length; - applet_items = g_new0 (ComboItem, applet_nb); - - for (i = 0; i < applet_nb; i++) { - MateComponent_ServerInfo *info; - - info = &applets->_buffer [i]; - - applet_items[i].name = info->iid; - applet_items[i].value = info->iid; - } - - setup_combo (applet_combo, applet_items, NULL, applet_nb, TRUE); - g_free (applet_items); - CORBA_free (applets); - - setup_combo (size_combo, size_items, "Size", - G_N_ELEMENTS (size_items), FALSE); - setup_combo (orient_combo, orient_items, "Orientation", - G_N_ELEMENTS (orient_items), FALSE); - - unique_key = mateconf_unique_key (); - prefs_dir = g_strdup_printf ("/tmp/%s", unique_key); - g_free (unique_key); - gtk_entry_set_text (GTK_ENTRY (prefs_dir_entry), prefs_dir); - g_free (prefs_dir); -} - -int -main (int argc, char **argv) -{ - GtkBuilder *builder; - char *uifile; - GError *error; - - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - error = NULL; - if (!gtk_init_with_args (&argc, &argv, - "", (GOptionEntry *) options, GETTEXT_PACKAGE, - &error)) { - if (error) { - g_printerr ("%s\n", error->message); - g_error_free (error); - } else - g_printerr ("Cannot initiliaze GTK+.\n"); - - return 1; - } - - if (!matecomponent_init (&argc, argv)) { - g_printerr ("Cannot initialize matecomponent.\n"); - return 1; - } - - if (cli_iid) { - load_applet_from_command_line (); - gtk_main (); - return 0; - } - - builder = gtk_builder_new (); - gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); - - uifile = MATE_PANEL_APPLET_BUILDERDIR "/panel-test-applets.ui"; - gtk_builder_add_from_file (builder, uifile, &error); - - if (error) { - g_warning ("Error loading \"%s\": %s", uifile, error->message); - g_error_free (error); - return 1; - } - - gtk_builder_connect_signals (builder, NULL); - - win = GTK_WIDGET (gtk_builder_get_object (builder, - "toplevel")); - applet_combo = GTK_WIDGET (gtk_builder_get_object (builder, - "applet-combo")); - prefs_dir_entry = GTK_WIDGET (gtk_builder_get_object (builder, - "prefs-dir-entry")); - orient_combo = GTK_WIDGET (gtk_builder_get_object (builder, - "orient-combo")); - size_combo = GTK_WIDGET (gtk_builder_get_object (builder, - "size-combo")); - g_object_unref (builder); - - setup_options (); - - gtk_widget_show (win); - - gtk_main (); - - return 0; -} diff --git a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui b/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui deleted file mode 100644 index 05916cf5..00000000 --- a/matecomponent/libmate-panel-applet/panel-test-applets-matecomponent.ui +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0"?> -<interface> - <!-- interface-requires gtk+ 2.6 --> - <!-- interface-naming-policy toplevel-contextual --> - <object class="GtkDialog" id="toplevel"> - <property name="visible">True</property> - <property name="title" translatable="yes" comments="This is an utility to easily test various applets">Test applet utility</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <property name="has_separator">False</property> - <signal name="destroy" handler="gtk_main_quit"/> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <property name="spacing">8</property> - <child> - <object class="GtkTable" id="table2"> - <property name="visible">True</property> - <property name="border_width">2</property> - <property name="n_rows">5</property> - <property name="n_columns">2</property> - <property name="column_spacing">4</property> - <property name="row_spacing">4</property> - <child> - <object class="GtkLabel" id="size-label"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Size:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">size-combo</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="applet-label"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Applet:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">applet-combo</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="orient-label"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Orientation:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">orient-combo</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="prefs-label"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Prefs Dir:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">prefs-dir-entry</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="prefs-dir-entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="applet-combo"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="orient-combo"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="size-combo"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkHSeparator" id="hseparator2"> - <property name="visible">True</property> - </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="ok-button"> - <property name="label">gtk-execute</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_execute_button_clicked"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button1"> - <property name="label">gtk-close</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="gtk_main_quit"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="0">ok-button</action-widget> - <action-widget response="-7">button1</action-widget> - </action-widgets> - </object> -</interface> diff --git a/matecomponent/libmate-panel-applet/test-matecomponent-applet.c b/matecomponent/libmate-panel-applet/test-matecomponent-applet.c deleted file mode 100644 index d57e7f96..00000000 --- a/matecomponent/libmate-panel-applet/test-matecomponent-applet.c +++ /dev/null @@ -1,204 +0,0 @@ -/* - * test-matecomponent-applet.c: - * - * Authors: - * Mark McLoughlin <[email protected]> - * - * Copyright 2001 Sun Microsystems, Inc. - */ - -#include <config.h> -#include <string.h> - -#include <libmatecomponentui.h> - -#include "mate-panel-applet.h" - -static void -test_applet_on_do (MateComponentUIComponent *uic, - gpointer user_data, - const gchar *verbname) -{ - g_message ("%s called\n", verbname); -} - -static const MateComponentUIVerb test_applet_menu_verbs [] = { - MATECOMPONENT_UI_VERB ("TestAppletDo1", test_applet_on_do), - MATECOMPONENT_UI_VERB ("TestAppletDo2", test_applet_on_do), - MATECOMPONENT_UI_VERB ("TestAppletDo3", test_applet_on_do), - - MATECOMPONENT_UI_VERB_END -}; - -static const char test_applet_menu_xml [] = - "<popup name=\"button3\">\n" - " <menuitem name=\"Test Item 1\" verb=\"TestAppletDo1\" _label=\"Test This One\"/>\n" - " <menuitem name=\"Test Item 2\" verb=\"TestAppletDo2\" _label=\"Test This Two\"/>\n" - " <menuitem name=\"Test Item 3\" verb=\"TestAppletDo3\" _label=\"Test This Three\"/>\n" - "</popup>\n"; - -typedef struct { - MatePanelApplet base; - GtkWidget *label; -} TestApplet; - -static GType -test_applet_get_type (void) -{ - static GType type = 0; - - if (!type) { - static const GTypeInfo info = { - sizeof (MatePanelAppletClass), - NULL, NULL, NULL, NULL, NULL, - sizeof (TestApplet), - 0, NULL, NULL - }; - - type = g_type_register_static ( - PANEL_TYPE_APPLET, "TestApplet", &info, 0); - } - - return type; -} - -static void -test_applet_handle_orient_change (TestApplet *applet, - MatePanelAppletOrient orient, - gpointer dummy) -{ - gchar *text; - - text = g_strdup (gtk_label_get_text (GTK_LABEL (applet->label))); - - g_strreverse (text); - - gtk_label_set_text (GTK_LABEL (applet->label), text); - - g_free (text); -} - -static void -test_applet_handle_size_change (TestApplet *applet, - gint size, - gpointer dummy) -{ - switch (size) { - case MATE_Vertigo_PANEL_XX_SMALL: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"xx-small\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_X_SMALL: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"x-small\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_SMALL: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"small\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_MEDIUM: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"medium\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_LARGE: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"large\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_X_LARGE: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"x-large\">Hello</span>"); - break; - case MATE_Vertigo_PANEL_XX_LARGE: - gtk_label_set_markup ( - GTK_LABEL (applet->label), "<span size=\"xx-large\">Hello</span>"); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -test_applet_handle_background_change (TestApplet *applet, - MatePanelAppletBackgroundType type, - GdkColor *color, - GdkPixmap *pixmap, - gpointer dummy) -{ - GdkWindow *window = gtk_widget_get_window (applet->label); - - switch (type) { - case PANEL_NO_BACKGROUND: - g_message ("Setting background to default"); - gdk_window_set_back_pixmap (window, NULL, FALSE); - break; - case PANEL_COLOR_BACKGROUND: - g_message ("Setting background to #%2x%2x%2x", - color->red, color->green, color->blue); - gdk_window_set_back_pixmap (window, NULL, FALSE); - break; - case PANEL_PIXMAP_BACKGROUND: - g_message ("Setting background to '%p'", pixmap); - gdk_window_set_back_pixmap (window, pixmap, FALSE); - break; - default: - g_assert_not_reached (); - break; - } -} - -static gboolean -test_applet_fill (TestApplet *applet) -{ - applet->label = gtk_label_new (NULL); - - gtk_container_add (GTK_CONTAINER (applet), applet->label); - - gtk_widget_show_all (GTK_WIDGET (applet)); - - test_applet_handle_size_change (applet, MATE_Vertigo_PANEL_MEDIUM, NULL); - - mate_panel_applet_setup_menu ( - MATE_PANEL_APPLET (applet), test_applet_menu_xml, test_applet_menu_verbs, NULL); - - gtk_widget_set_tooltip_text (GTK_WIDGET (applet), "Hello Tip"); - - mate_panel_applet_set_flags (MATE_PANEL_APPLET (applet), MATE_PANEL_APPLET_HAS_HANDLE); - - g_signal_connect (G_OBJECT (applet), - "change_orient", - G_CALLBACK (test_applet_handle_orient_change), - NULL); - - g_signal_connect (G_OBJECT (applet), - "change_size", - G_CALLBACK (test_applet_handle_size_change), - NULL); - - g_signal_connect (G_OBJECT (applet), - "change_background", - G_CALLBACK (test_applet_handle_background_change), - NULL); - - return TRUE; -} - -static gboolean -test_applet_factory (TestApplet *applet, - const gchar *iid, - gpointer data) -{ - gboolean retval = FALSE; - - if (!strcmp (iid, "OAFIID:MATE_Panel_TestMateComponentApplet")) - retval = test_applet_fill (applet); - - return retval; -} - -MATE_PANEL_APPLET_MATECOMPONENT_FACTORY ("OAFIID:MATE_Panel_TestMateComponentApplet_Factory", - test_applet_get_type (), - "A Test Applet for the MATE-2.0 Panel", - "0", - (MatePanelAppletFactoryCallback) test_applet_factory, - NULL) diff --git a/matecomponent/panel-module/MATE_Panel_Popup.xml b/matecomponent/panel-module/MATE_Panel_Popup.xml deleted file mode 100644 index 9956f2e6..00000000 --- a/matecomponent/panel-module/MATE_Panel_Popup.xml +++ /dev/null @@ -1,20 +0,0 @@ -<Root> - <popups> - <popup name="button3"> - - <placeholder delimit="top"> - - <menuitem name="remove" verb="RemoveAppletFromPanel" _label="_Remove From Panel" - pixtype="stock" pixname="gtk-remove"/> - - <menuitem name="move" verb="MoveApplet" _label="_Move"/> - - <separator verb="LockSeparator"/> - - <menuitem name="lock" verb="LockAppletToPanel" _label="Loc_k To Panel" - type="toggle"/> - - </placeholder> - </popup> - </popups> -</Root> diff --git a/matecomponent/panel-module/Makefile.am b/matecomponent/panel-module/Makefile.am deleted file mode 100644 index 8c353127..00000000 --- a/matecomponent/panel-module/Makefile.am +++ /dev/null @@ -1,51 +0,0 @@ -panelmodule_LTLIBRARIES = libmate-panel-applets-matecomponent.la -panelmoduledir = $(modulesdir) - -libmate_panel_applets_matecomponent_la_SOURCES = \ - $(CORBA_SRCLIST) \ - mate-panel-applets-matecomponent-module.c \ - mate-panel-applets-manager-matecomponent.c \ - mate-panel-applets-manager-matecomponent.h \ - mate-panel-applet-frame-matecomponent.c \ - mate-panel-applet-frame-matecomponent.h - -libmate_panel_applets_matecomponent_la_CPPFLAGS = \ - $(MATECOMPONENT_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/mate-panel \ - -I$(top_builddir) \ - -DDATADIR=\""$(datadir)"\" - -libmate_panel_applets_matecomponent_la_LDFLAGS = \ - -export_dynamic -avoid-version -module -no-undefined \ - -export-symbols-regex '^g_io_module_(load|unload|query)' - -libmate_panel_applets_matecomponent_la_LIBADD = \ - $(MATECOMPONENT_LIBS) - -CORBA_SRCLIST = \ - MATE_Panel-stubs.c \ - MATE_Panel-skels.c \ - MATE_Panel-common.c \ - MATE_Panel.h - -$(CORBA_SRCLIST): $(top_srcdir)/matecomponent/idl/MATE_Panel.idl $(MATECORBA_IDL) - $(AM_V_GEN)$(MATECORBA_IDL) -I $(MATECOMPONENT_IDLDIR) -I $(MATECOMPONENT_ACT_IDLDIR) $(top_srcdir)/matecomponent/idl/MATE_Panel.idl - -xmluidir = $(datadir)/mate-2.0/ui -xmlui_DATA = MATE_Panel_Popup.xml - -install-data-hook: - if test -z "$(DESTDIR)" -a "$(GIO_QUERYMODULES)" != "no" ; then \ - $(GIO_QUERYMODULES) $(modulesdir) ; \ - fi -uninstall-local: - if test "$(GIO_QUERYMODULES)" != "no" ; then \ - $(GIO_QUERYMODULES) $(modulesdir) ; \ - fi - -EXTRA_DIST = $(xmlui_DATA) - -CLEANFILES = $(CORBA_SRCLIST) - --include $(top_srcdir)/git.mk diff --git a/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.c b/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.c deleted file mode 100644 index e62a13a7..00000000 --- a/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.c +++ /dev/null @@ -1,759 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * mate-panel-applet-frame-matecomponent.c: panel side container for applets - * - * Copyright (C) 2001 - 2003 Sun Microsystems, Inc. - * Copyright (C) 2010 Vincent Untz <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#include <config.h> - -#include <string.h> - -#include <libmatecomponentui.h> - -#include <mate-panel-applet-frame.h> -#include <mate-panel-applets-manager.h> - -#include "MATE_Panel.h" - -#include "mate-panel-applet-frame-matecomponent.h" - -G_DEFINE_TYPE (MatePanelAppletFrameMateComponent, - mate_panel_applet_frame_matecomponent, - PANEL_TYPE_APPLET_FRAME) - -struct _MatePanelAppletFrameMateComponentPrivate -{ - MATE_Vertigo_MatePanelAppletShell applet_shell; - CORBA_Object control; - MateComponent_PropertyBag property_bag; - MateComponentUIComponent *ui_component; -}; - -#define PROPERTY_ORIENT "mate-panel-applet-orient" -#define PROPERTY_SIZE "mate-panel-applet-size" -#define PROPERTY_BACKGROUND "mate-panel-applet-background" -#define PROPERTY_FLAGS "mate-panel-applet-flags" -#define PROPERTY_SIZE_HINTS "mate-panel-applet-size-hints" -#define PROPERTY_LOCKED_DOWN "mate-panel-applet-locked-down" - -typedef enum { - PANEL_SIZE_XX_SMALL = MATE_Vertigo_PANEL_XX_SMALL, - PANEL_SIZE_X_SMALL = MATE_Vertigo_PANEL_X_SMALL, - PANEL_SIZE_SMALL = MATE_Vertigo_PANEL_SMALL, - PANEL_SIZE_MEDIUM = MATE_Vertigo_PANEL_MEDIUM, - PANEL_SIZE_LARGE = MATE_Vertigo_PANEL_LARGE, - PANEL_SIZE_X_LARGE = MATE_Vertigo_PANEL_X_LARGE, - PANEL_SIZE_XX_LARGE = MATE_Vertigo_PANEL_XX_LARGE -} PanelSize; - -/* Keep in sync with mate-panel-applet.h. Uggh. */ -typedef enum { - APPLET_FLAGS_NONE = 0, - APPLET_EXPAND_MAJOR = 1 << 0, - APPLET_EXPAND_MINOR = 1 << 1, - APPLET_HAS_HANDLE = 1 << 2 -} MatePanelAppletFlags; - -GQuark -mate_panel_applet_frame_matecomponent_error_quark (void) -{ - static GQuark ret = 0; - - if (ret == 0) { - ret = g_quark_from_static_string ("mate_panel_applet_frame_matecomponent_error"); - } - - return ret; -} - -static guint -get_mate_panel_applet_orient (PanelOrientation orientation) -{ - /* For some reason libmate-panel-applet and panel use a different logic for - * orientation, so we need to convert it. We should fix this. */ - switch (orientation) { - case PANEL_ORIENTATION_TOP: - return 1; - case PANEL_ORIENTATION_BOTTOM: - return 0; - case PANEL_ORIENTATION_LEFT: - return 3; - case PANEL_ORIENTATION_RIGHT: - return 2; - default: - g_assert_not_reached (); - break; - } -} - -static void -mate_panel_applet_frame_matecomponent_update_flags (MatePanelAppletFrame *frame, - const CORBA_any *any) -{ - int flags; - gboolean major; - gboolean minor; - gboolean has_handle; - - flags = MATECOMPONENT_ARG_GET_SHORT (any); - - major = (flags & APPLET_EXPAND_MAJOR) != 0; - minor = (flags & APPLET_EXPAND_MINOR) != 0; - has_handle = (flags & APPLET_HAS_HANDLE) != 0; - - _mate_panel_applet_frame_update_flags (frame, major, minor, has_handle); -} - -static void -mate_panel_applet_frame_matecomponent_update_size_hints (MatePanelAppletFrame *frame, - const CORBA_any *any) -{ - CORBA_sequence_CORBA_long *seq; - - seq = any->_value; - - _mate_panel_applet_frame_update_size_hints (frame, seq->_buffer, seq->_length); -} - -static void -mate_panel_applet_frame_matecomponent_init_properties (MatePanelAppletFrame *frame) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - CORBA_any *any; - - any = matecomponent_pbclient_get_value (matecomponent_frame->priv->property_bag, - PROPERTY_FLAGS, - MATECOMPONENT_ARG_SHORT, - NULL); - if (any) { - mate_panel_applet_frame_matecomponent_update_flags (frame, any); - CORBA_free (any); - } - - any = matecomponent_pbclient_get_value (matecomponent_frame->priv->property_bag, - PROPERTY_SIZE_HINTS, - TC_CORBA_sequence_CORBA_long, - NULL); - if (any) { - mate_panel_applet_frame_matecomponent_update_size_hints (frame, any); - CORBA_free (any); - } -} - -static void -mate_panel_applet_frame_matecomponent_sync_menu_state (MatePanelAppletFrame *frame, - gboolean movable, - gboolean removable, - gboolean lockable, - gboolean locked, - gboolean locked_down) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/LockAppletToPanel", - "state", - locked ? "1" : "0", - NULL); - - /* First sensitivity */ - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/LockAppletToPanel", - "sensitive", - lockable ? "1" : "0", - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/RemoveAppletFromPanel", - "sensitive", - (locked && !lockable) ? "0" : (removable ? "1" : "0"), - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/MoveApplet", - "sensitive", - locked ? "0" : (movable ? "1" : "0"), - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/LockAppletToPanel", - "hidden", - locked_down ? "1" : "0", - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/LockSeparator", - "hidden", - locked_down ? "1" : "0", - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/RemoveAppletFromPanel", - "hidden", - locked_down ? "1" : "0", - NULL); - - matecomponent_ui_component_set_prop (matecomponent_frame->priv->ui_component, - "/commands/MoveApplet", - "hidden", - locked_down ? "1" : "0", - NULL); -} - -static void -mate_panel_applet_frame_matecomponent_popup_menu (MatePanelAppletFrame *frame, - guint button, - guint32 timestamp) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - CORBA_Environment env; - - CORBA_exception_init (&env); - - MATE_Vertigo_MatePanelAppletShell_popup_menu (matecomponent_frame->priv->applet_shell, - button, timestamp, &env); - if (MATECOMPONENT_EX (&env)) - g_warning ("Exception from popup_menu '%s'\n", env._id); - - CORBA_exception_free (&env); -} - -static void -mate_panel_applet_frame_matecomponent_change_orientation (MatePanelAppletFrame *frame, - PanelOrientation orientation) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - CORBA_unsigned_short orient = 0; - - switch (orientation) { - case PANEL_ORIENTATION_TOP: - orient = MATE_Vertigo_PANEL_ORIENT_DOWN; - break; - case PANEL_ORIENTATION_BOTTOM: - orient = MATE_Vertigo_PANEL_ORIENT_UP; - break; - case PANEL_ORIENTATION_LEFT: - orient = MATE_Vertigo_PANEL_ORIENT_RIGHT; - break; - case PANEL_ORIENTATION_RIGHT: - orient = MATE_Vertigo_PANEL_ORIENT_LEFT; - break; - default: - g_assert_not_reached (); - break; - } - - matecomponent_pbclient_set_short (matecomponent_frame->priv->property_bag, - PROPERTY_ORIENT, - orient, - NULL); - - gtk_widget_queue_resize (GTK_WIDGET (frame)); -} - -static void -mate_panel_applet_frame_matecomponent_change_size (MatePanelAppletFrame *frame, - guint size) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - - /* Normalise the size to the constants defined in the IDL. */ - size = size <= PANEL_SIZE_XX_SMALL ? PANEL_SIZE_XX_SMALL : - size <= PANEL_SIZE_X_SMALL ? PANEL_SIZE_X_SMALL : - size <= PANEL_SIZE_SMALL ? PANEL_SIZE_SMALL : - size <= PANEL_SIZE_MEDIUM ? PANEL_SIZE_MEDIUM : - size <= PANEL_SIZE_LARGE ? PANEL_SIZE_LARGE : - size <= PANEL_SIZE_X_LARGE ? PANEL_SIZE_X_LARGE : PANEL_SIZE_XX_LARGE; - - matecomponent_pbclient_set_short (matecomponent_frame->priv->property_bag, - PROPERTY_SIZE, - size, - NULL); -} - -static void -mate_panel_applet_frame_matecomponent_change_background (MatePanelAppletFrame *frame, - PanelBackgroundType type) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (frame); - char *bg_str; - - bg_str = _mate_panel_applet_frame_get_background_string ( - frame, PANEL_WIDGET (GTK_WIDGET (frame)->parent), type); - - if (bg_str != NULL) { - matecomponent_pbclient_set_string (matecomponent_frame->priv->property_bag, - PROPERTY_BACKGROUND, - bg_str, NULL); - - g_free (bg_str); - } -} - -static void -mate_panel_applet_frame_matecomponent_applet_broken (MateCORBAConnection *cnx, - MatePanelAppletFrame *frame) -{ - _mate_panel_applet_frame_applet_broken (frame); -} - -static void -popup_handle_remove (MateComponentUIComponent *uic, - MatePanelAppletFrame *frame, - const gchar *verbname) -{ - _mate_panel_applet_frame_applet_remove (frame); -} - -static void -popup_handle_move (MateComponentUIComponent *uic, - MatePanelAppletFrame *frame, - const gchar *verbname) -{ - _mate_panel_applet_frame_applet_move (frame); -} - -static void -listener_popup_handle_lock (MateComponentUIComponent *uic, - const char *path, - MateComponent_UIComponent_EventType type, - const char *state, - gpointer data) -{ - MatePanelAppletFrame *frame; - gboolean locked; - - g_assert (!strcmp (path, "LockAppletToPanel")); - - if (type != MateComponent_UIComponent_STATE_CHANGED) - return; - - if (!state) - return; - - frame = (MatePanelAppletFrame *) data; - locked = (strcmp (state, "1") == 0); - - _mate_panel_applet_frame_applet_lock (frame, locked); - - mate_panel_applet_frame_sync_menu_state (frame); -} - -static MateComponentUIVerb popup_verbs [] = { - MATECOMPONENT_UI_UNSAFE_VERB ("RemoveAppletFromPanel", popup_handle_remove), - MATECOMPONENT_UI_UNSAFE_VERB ("MoveApplet", popup_handle_move), - - MATECOMPONENT_UI_VERB_END -}; - - -static void -mate_panel_applet_frame_matecomponent_finalize (GObject *object) -{ - MatePanelAppletFrameMateComponent *frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (object); - - if (frame->priv->control) { - /* do this before unref'ing every matecomponent stuff since it looks - * like we can receive some events when unref'ing them */ - MateCORBA_small_unlisten_for_broken (frame->priv->control, - G_CALLBACK (mate_panel_applet_frame_matecomponent_applet_broken)); - matecomponent_object_release_unref (frame->priv->control, NULL); - frame->priv->control = CORBA_OBJECT_NIL; - } - - if (frame->priv->property_bag) - matecomponent_object_release_unref ( - frame->priv->property_bag, NULL); - - if (frame->priv->applet_shell) - matecomponent_object_release_unref ( - frame->priv->applet_shell, NULL); - - if (frame->priv->ui_component) - matecomponent_object_unref ( - MATECOMPONENT_OBJECT (frame->priv->ui_component)); - - G_OBJECT_CLASS (mate_panel_applet_frame_matecomponent_parent_class)->finalize (object); -} - -static void -mate_panel_applet_frame_matecomponent_init (MatePanelAppletFrameMateComponent *frame) -{ - GtkWidget *container; - - frame->priv = G_TYPE_INSTANCE_GET_PRIVATE (frame, - PANEL_TYPE_APPLET_FRAME_MATECOMPONENT, - MatePanelAppletFrameMateComponentPrivate); - - frame->priv->applet_shell = CORBA_OBJECT_NIL; - frame->priv->control = CORBA_OBJECT_NIL; - frame->priv->property_bag = CORBA_OBJECT_NIL; - frame->priv->ui_component = NULL; -} - -static void -mate_panel_applet_frame_matecomponent_class_init (MatePanelAppletFrameMateComponentClass *class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (class); - MatePanelAppletFrameClass *frame_class = MATE_PANEL_APPLET_FRAME_CLASS (class); - - gobject_class->finalize = mate_panel_applet_frame_matecomponent_finalize; - - frame_class->init_properties = mate_panel_applet_frame_matecomponent_init_properties; - frame_class->sync_menu_state = mate_panel_applet_frame_matecomponent_sync_menu_state; - frame_class->popup_menu = mate_panel_applet_frame_matecomponent_popup_menu; - frame_class->change_orientation = mate_panel_applet_frame_matecomponent_change_orientation; - frame_class->change_size = mate_panel_applet_frame_matecomponent_change_size; - frame_class->change_background = mate_panel_applet_frame_matecomponent_change_background; - - g_type_class_add_private (class, sizeof (MatePanelAppletFrameMateComponentPrivate)); -} - -static MATE_Vertigo_MatePanelAppletShell -mate_panel_applet_frame_get_applet_shell (MateComponent_Control control) -{ - CORBA_Environment env; - MATE_Vertigo_MatePanelAppletShell retval; - - CORBA_exception_init (&env); - - retval = MateComponent_Unknown_queryInterface (control, - "IDL:MATE/Vertigo/MatePanelAppletShell:1.0", - &env); - if (MATECOMPONENT_EX (&env)) { - g_warning ("Unable to obtain AppletShell interface from control\n"); - - retval = CORBA_OBJECT_NIL; - } - - CORBA_exception_free (&env); - - return retval; -} - -static const char* mate_panel_applet_frame_get_orient_string(MatePanelAppletFrame* frame, MatePanelAppletFrameActivating* frame_act) -{ - PanelOrientation orientation; - const char* retval = NULL; - - orientation = mate_panel_applet_frame_activating_get_orientation(frame_act); - - switch (orientation) - { - case PANEL_ORIENTATION_TOP: - retval = "down"; - break; - case PANEL_ORIENTATION_BOTTOM: - retval = "up"; - break; - case PANEL_ORIENTATION_LEFT: - retval = "right"; - break; - case PANEL_ORIENTATION_RIGHT: - retval = "left"; - break; - default: - g_assert_not_reached(); - break; - } - - return retval; -} - -static const char* mate_panel_applet_frame_get_size_string (MatePanelAppletFrame* frame, MatePanelAppletFrameActivating* frame_act) -{ - const char* retval = NULL; - guint32 size; - - size = mate_panel_applet_frame_activating_get_size(frame_act); - - if (size <= PANEL_SIZE_XX_SMALL) - { - retval = "xx-small"; - } - else if (size <= PANEL_SIZE_X_SMALL) - { - retval = "x-small"; - } - else if (size <= PANEL_SIZE_SMALL) - { - retval = "small"; - } - else if (size <= PANEL_SIZE_MEDIUM) - { - retval = "medium"; - } - else if (size <= PANEL_SIZE_LARGE) - { - retval = "large"; - } - else if (size <= PANEL_SIZE_X_LARGE) - { - retval = "x-large"; - } - else - { - retval = "xx-large"; - } - - return retval; -} - -static char * -mate_panel_applet_frame_construct_item (MatePanelAppletFrame *frame, - MatePanelAppletFrameActivating *frame_act) -{ - char *retval; - char *conf_path = NULL; - char *bg_str = NULL; - gboolean locked_down; - - conf_path = mate_panel_applet_frame_activating_get_conf_path (frame_act); - //FIXME vuntz -#if 0 - bg_str = _mate_panel_applet_frame_get_background_string ( - frame, panel, panel->background.type); -#endif - - if (bg_str == NULL) - bg_str = g_strdup (""); - - locked_down = mate_panel_applet_frame_activating_get_locked_down (frame_act); - - retval = g_strdup_printf ( - "prefs_key=%s;" - "background=%s;orient=%s;size=%s;locked_down=%s", - conf_path, bg_str, - mate_panel_applet_frame_get_orient_string (frame, frame_act), - mate_panel_applet_frame_get_size_string (frame, frame_act), - locked_down ? "true" : "false"); - - g_free (conf_path); - g_free (bg_str); - - return retval; -} - -static void -mate_panel_applet_frame_event_listener (MateComponentListener *listener, - const char *event, - const CORBA_any *any, - CORBA_Environment *ev, - MatePanelAppletFrame *frame) -{ - if (!strcmp (event, "MateComponent/Property:change:" PROPERTY_FLAGS)) - mate_panel_applet_frame_matecomponent_update_flags (frame, any); - - else if (!strcmp (event, "MateComponent/Property:change:" PROPERTY_SIZE_HINTS)) - mate_panel_applet_frame_matecomponent_update_size_hints (frame, any); -} - -static void -mate_panel_applet_frame_matecomponent_activated (CORBA_Object object, - const char *error_reason, - gpointer data) -{ - MatePanelAppletFrameActivating *frame_act; - MatePanelAppletFrameMateComponent *matecomponent_frame; - MatePanelAppletFrame *frame; - GtkWidget *widget; - MateComponentControlFrame *control_frame; - MateComponent_Control control; - MateComponent_ItemContainer container; - CORBA_Environment corba_ev; - AppletInfo *info; - char *error; - char *item_name; - GError *gerror = NULL; - - widget = NULL; - matecomponent_frame = MATE_PANEL_APPLET_FRAME_MATECOMPONENT (data); - frame = MATE_PANEL_APPLET_FRAME (data); - frame_act = g_object_get_data (G_OBJECT (frame), "mate-panel-applet-frame-activating"); - g_object_set_data (G_OBJECT (frame), "mate-panel-applet-frame-activating", NULL); - - /* according to the source of matecomponent control == NULL && no - exception can happen, so handle it */ - if (error_reason != NULL || object == CORBA_OBJECT_NIL) { - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, error_reason); - goto error_out; - } - - CORBA_exception_init (&corba_ev); - - item_name = mate_panel_applet_frame_construct_item (frame, - frame_act); - - matecomponent_frame->priv->control = CORBA_OBJECT_NIL; - container = MateComponent_Unknown_queryInterface (object, - "IDL:MateComponent/ItemContainer:1.0", - &corba_ev); - if (!MATECOMPONENT_EX (&corba_ev) && container != CORBA_OBJECT_NIL) { - MateComponent_Unknown containee; - - containee = MateComponent_ItemContainer_getObjectByName (container, - item_name, - TRUE, - &corba_ev); - matecomponent_object_release_unref (container, NULL); - - if (!MATECOMPONENT_EX (&corba_ev) && containee != CORBA_OBJECT_NIL) { - matecomponent_frame->priv->control = - MateComponent_Unknown_queryInterface (containee, - "IDL:MateComponent/Control:1.0", - &corba_ev); - - matecomponent_object_release_unref (containee, NULL); - } - } - g_free (item_name); - - if (matecomponent_frame->priv->control == CORBA_OBJECT_NIL) { - error = matecomponent_exception_get_text (&corba_ev); - gerror = g_error_new (mate_panel_applet_frame_matecomponent_error_quark (), 0, "failed to get MateComponent/Control interface:\n", error); - CORBA_exception_free (&corba_ev); - matecomponent_object_release_unref (object, NULL); - g_free (error); - goto error_out; - } - - widget = matecomponent_widget_new_control_from_objref (matecomponent_frame->priv->control, - CORBA_OBJECT_NIL); - - CORBA_exception_free (&corba_ev); - matecomponent_object_release_unref (object, NULL); - - if (!widget) { - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, "no widget created"); - goto error_out; - } - - control_frame = matecomponent_widget_get_control_frame (MATECOMPONENT_WIDGET (widget)); - if (control_frame == NULL) { - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, "cannot get control frame"); - goto error_out; - } - - matecomponent_frame->priv->property_bag = - matecomponent_control_frame_get_control_property_bag (control_frame, - &corba_ev); - if (matecomponent_frame->priv->property_bag == NULL || MATECOMPONENT_EX (&corba_ev)) { - error = matecomponent_exception_get_text (&corba_ev); - CORBA_exception_free (&corba_ev); - gerror = g_error_new (mate_panel_applet_frame_matecomponent_error_quark (), 0, "cannot get property bag frame:\n%s", error); - g_free (error); - goto error_out; - } - - matecomponent_event_source_client_add_listener (matecomponent_frame->priv->property_bag, - (MateComponentListenerCallbackFn) mate_panel_applet_frame_event_listener, - "MateComponent/Property:change:mate-panel-applet", - NULL, - frame); - - matecomponent_frame->priv->ui_component = - matecomponent_control_frame_get_popup_component (control_frame, - &corba_ev); - if (matecomponent_frame->priv->ui_component == NULL || MATECOMPONENT_EX (&corba_ev)) { - error = matecomponent_exception_get_text (&corba_ev); - CORBA_exception_free (&corba_ev); - gerror = g_error_new (mate_panel_applet_frame_matecomponent_error_quark (), 0, "cannot get popup component:\n%s", error); - g_free (error); - goto error_out; - } - - matecomponent_ui_util_set_ui (matecomponent_frame->priv->ui_component, DATADIR, - "MATE_Panel_Popup.xml", "panel", NULL); - - matecomponent_ui_component_add_listener (matecomponent_frame->priv->ui_component, - "LockAppletToPanel", - listener_popup_handle_lock, - frame); - - matecomponent_ui_component_add_verb_list_with_data ( - matecomponent_frame->priv->ui_component, popup_verbs, frame); - - control = matecomponent_control_frame_get_control (control_frame); - if (!control) { - CORBA_exception_free (&corba_ev); - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, "cannot get control"); - goto error_out; - } - - matecomponent_frame->priv->applet_shell = mate_panel_applet_frame_get_applet_shell (control); - if (matecomponent_frame->priv->applet_shell == CORBA_OBJECT_NIL) { - CORBA_exception_free (&corba_ev); - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, "cannot get applet shell"); - goto error_out; - } - - CORBA_exception_free (&corba_ev); - - MateCORBA_small_listen_for_broken (object, - G_CALLBACK (mate_panel_applet_frame_matecomponent_applet_broken), - frame); - - gtk_container_add (GTK_CONTAINER (frame), widget); - - goto out; - -error_out: - if (widget) - g_object_unref (widget); - if (!gerror) - gerror = g_error_new_literal (mate_panel_applet_frame_matecomponent_error_quark (), 0, "unknown error"); - -out: - _mate_panel_applet_frame_activated (frame, frame_act, gerror); -} - -gboolean -mate_panel_applet_frame_matecomponent_load (const gchar *iid, - MatePanelAppletFrameActivating *frame_act) -{ - MatePanelAppletFrameMateComponent *matecomponent_frame; - MatePanelAppletFrame *frame; - CORBA_Environment ev; - - g_return_val_if_fail (iid != NULL, FALSE); - g_return_val_if_fail (frame_act != NULL, FALSE); - - if (!mate_panel_applets_manager_factory_activate (iid)) - return FALSE; - - matecomponent_frame = g_object_new (PANEL_TYPE_APPLET_FRAME_MATECOMPONENT, NULL); - frame = MATE_PANEL_APPLET_FRAME (matecomponent_frame); - _mate_panel_applet_frame_set_iid (frame, iid); - - g_object_set_data (G_OBJECT (frame), "mate-panel-applet-frame-activating", frame_act); - - CORBA_exception_init (&ev); - - matecomponent_activation_activate_from_id_async ((gchar *) iid, 0, - (MateComponentActivationCallback) mate_panel_applet_frame_matecomponent_activated, - frame, &ev); - - CORBA_exception_free (&ev); - - return TRUE; -} diff --git a/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.h b/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.h deleted file mode 100644 index b6246e26..00000000 --- a/matecomponent/panel-module/mate-panel-applet-frame-matecomponent.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * mate-panel-applet-frame-matecomponent.h: panel side container for applets - * - * Copyright (C) 2001 - 2003 Sun Microsystems, Inc. - * Copyright (C) 2010 Vincent Untz <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Mark McLoughlin <[email protected]> - */ - -#ifndef __MATE_PANEL_APPLET_FRAME_MATECOMPONENT_H__ -#define __MATE_PANEL_APPLET_FRAME_MATECOMPONENT_H__ - -#include <mate-panel-applet-frame.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#define PANEL_TYPE_APPLET_FRAME_MATECOMPONENT (mate_panel_applet_frame_matecomponent_get_type ()) -#define MATE_PANEL_APPLET_FRAME_MATECOMPONENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), PANEL_TYPE_APPLET_FRAME_MATECOMPONENT, MatePanelAppletFrameMateComponent)) -#define MATE_PANEL_APPLET_FRAME_MATECOMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), PANEL_TYPE_APPLET_FRAME_MATECOMPONENT, MatePanelAppletFrameMateComponentClass)) -#define PANEL_IS_APPLET_FRAME_MATECOMPONENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), PANEL_TYPE_APPLET_FRAME_MATECOMPONENT)) -#define PANEL_IS_APPLET_FRAME_MATECOMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), PANEL_TYPE_APPLET_FRAME_MATECOMPONENT)) -#define MATE_PANEL_APPLET_FRAME_MATECOMPONENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), PANEL_TYPE_APPLET_FRAME_MATECOMPONENT, MatePanelAppletFrameMateComponentClass)) - -typedef struct _MatePanelAppletFrameMateComponent MatePanelAppletFrameMateComponent; -typedef struct _MatePanelAppletFrameMateComponentClass MatePanelAppletFrameMateComponentClass; -typedef struct _MatePanelAppletFrameMateComponentPrivate MatePanelAppletFrameMateComponentPrivate; - -struct _MatePanelAppletFrameMateComponentClass { - MatePanelAppletFrameClass parent_class; -}; - -struct _MatePanelAppletFrameMateComponent{ - MatePanelAppletFrame parent; - - MatePanelAppletFrameMateComponentPrivate *priv; -}; - -GType mate_panel_applet_frame_matecomponent_get_type (void) G_GNUC_CONST; - -gboolean mate_panel_applet_frame_matecomponent_load (const gchar *iid, - MatePanelAppletFrameActivating *frame_act); - -#ifdef __cplusplus -} -#endif - -#endif /* __MATE_PANEL_APPLET_FRAME_MATECOMPONENT_H__ */ diff --git a/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.c b/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.c deleted file mode 100644 index 3a0187a8..00000000 --- a/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.c +++ /dev/null @@ -1,250 +0,0 @@ -/* - * mate-panel-applets-manager-matecomponent.c - * - * Copyright (C) 2010 Vincent Untz <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#include <config.h> - -#include <string.h> -#include <libmatecomponent.h> - -#include <mate-panel-applets-manager.h> - -#include "mate-panel-applet-frame-matecomponent.h" - -#include "mate-panel-applets-manager-matecomponent.h" - -G_DEFINE_DYNAMIC_TYPE (MatePanelAppletsManagerMateComponent, mate_panel_applets_manager_matecomponent, PANEL_TYPE_APPLETS_MANAGER); - -struct _MatePanelAppletsManagerMateComponentPrivate -{ - GHashTable *applets; -}; - -static const char applet_requirements [] = - "has_all (repo_ids, ['IDL:MateComponent/Control:1.0'," - " 'IDL:MATE/Vertigo/MatePanelAppletShell:1.0']) && " - "defined (panel:icon)"; - -static char *applet_sort_criteria [] = { - "name", - NULL - }; - -static void -mate_panel_applets_manager_matecomponent_load_applet_infos (MatePanelAppletsManagerMateComponent *manager) -{ - MateComponent_ServerInfoList *applet_list; - CORBA_Environment env; - const char * const *langs; - GSList *langs_gslist; - int i; - - CORBA_exception_init (&env); - - applet_list = matecomponent_activation_query (applet_requirements, - applet_sort_criteria, - &env); - if (MATECOMPONENT_EX (&env)) { - g_warning ("MateComponent query returned exception %s\n", - MATECOMPONENT_EX_REPOID (&env)); - - CORBA_exception_free (&env); - CORBA_free (applet_list); - - return; - } - - CORBA_exception_free (&env); - - langs = g_get_language_names (); - - langs_gslist = NULL; - for (i = 0; langs[i]; i++) - langs_gslist = g_slist_prepend (langs_gslist, (char *) langs[i]); - - langs_gslist = g_slist_reverse (langs_gslist); - - for (i = 0; i < applet_list->_length; i++) { - MateComponent_ServerInfo *info; - const char *name, *description, *icon; - MatePanelAppletInfo *applet_info; - - info = &applet_list->_buffer[i]; - - name = matecomponent_server_info_prop_lookup (info, - "name", - langs_gslist); - description = matecomponent_server_info_prop_lookup (info, - "description", - langs_gslist); - icon = matecomponent_server_info_prop_lookup (info, - "panel:icon", - NULL); - - applet_info = mate_panel_applet_info_new (info->iid, name, description, icon, NULL); - - g_hash_table_insert (manager->priv->applets, g_strdup (info->iid), applet_info); - } - - g_slist_free (langs_gslist); - CORBA_free (applet_list); -} - -static GList * -mate_panel_applets_manager_matecomponent_get_applets (MatePanelAppletsManager *manager) -{ - MatePanelAppletsManagerMateComponent *matecomponent_manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (manager); - - GHashTableIter iter; - gpointer key, value; - GList *retval = NULL; - - g_hash_table_iter_init (&iter, matecomponent_manager->priv->applets); - while (g_hash_table_iter_next (&iter, &key, &value)) - retval = g_list_prepend (retval, value); - - return g_list_reverse (retval);; -} - -static gboolean -mate_panel_applets_manager_matecomponent_factory_activate (MatePanelAppletsManager *manager, - const gchar *iid) -{ - MatePanelAppletsManagerMateComponent *matecomponent_manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (manager); - MatePanelAppletInfo *info; - - /* we let matecomponent deal with that, but we need to return the right value */ - - info = g_hash_table_lookup (matecomponent_manager->priv->applets, iid); - - return (info != NULL); -} - -static gboolean -mate_panel_applets_manager_matecomponent_factory_deactivate (MatePanelAppletsManager *manager, - const gchar *iid) -{ - MatePanelAppletsManagerMateComponent *matecomponent_manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (manager); - MatePanelAppletInfo *info; - - /* we let matecomponent deal with that, but we need to return the right value */ - - info = g_hash_table_lookup (matecomponent_manager->priv->applets, iid); - - return (info != NULL); -} - -static MatePanelAppletInfo * -mate_panel_applets_manager_matecomponent_get_applet_info (MatePanelAppletsManager *manager, - const gchar *iid) -{ - MatePanelAppletsManagerMateComponent *matecomponent_manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (manager); - - return g_hash_table_lookup (matecomponent_manager->priv->applets, iid); -} - -static MatePanelAppletInfo * -mate_panel_applets_manager_matecomponent_get_applet_info_from_old_id (MatePanelAppletsManager *manager, - const gchar *iid) -{ - MatePanelAppletsManagerMateComponent *matecomponent_manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (manager); - - return g_hash_table_lookup (matecomponent_manager->priv->applets, iid); -} - -static gboolean -mate_panel_applets_manager_matecomponent_load_applet (MatePanelAppletsManager *manager, - const gchar *iid, - MatePanelAppletFrameActivating *frame_act) -{ - return mate_panel_applet_frame_matecomponent_load (iid, frame_act); -} - -static void -mate_panel_applets_manager_matecomponent_finalize (GObject *object) -{ - MatePanelAppletsManagerMateComponent *manager = MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT (object); - - if (manager->priv->applets) { - g_hash_table_destroy (manager->priv->applets); - manager->priv->applets = NULL; - } - - G_OBJECT_CLASS (mate_panel_applets_manager_matecomponent_parent_class)->finalize (object); -} - -static void -mate_panel_applets_manager_matecomponent_init (MatePanelAppletsManagerMateComponent *manager) -{ - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, - PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT, - MatePanelAppletsManagerMateComponentPrivate); - - manager->priv->applets = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) mate_panel_applet_info_free); - - mate_panel_applets_manager_matecomponent_load_applet_infos (manager); -} - -static void -mate_panel_applets_manager_matecomponent_class_finalize (MatePanelAppletsManagerMateComponentClass *class) -{ -} - -static void -mate_panel_applets_manager_matecomponent_class_init (MatePanelAppletsManagerMateComponentClass *class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (class); - MatePanelAppletsManagerClass *manager_class = MATE_PANEL_APPLETS_MANAGER_CLASS (class); - - /* This is a horrible hack: we shouldn't call matecomponent_init() here, but - * in g_io_module_load() or even - * mate_panel_applets_manager_matecomponent_register(). However, it looks like if - * there's no giomodule.cache file, the module gets unloaded, and - * matecomponent_init() gets called twice, which makes everythings goes wrong: - * matecomponent has been unloaded so believes it has to get initialized, but - * the types are already registered in the GType system. And bam. */ - - matecomponent_init (NULL, NULL); - - gobject_class->finalize = mate_panel_applets_manager_matecomponent_finalize; - - manager_class->get_applets = mate_panel_applets_manager_matecomponent_get_applets; - manager_class->factory_activate = mate_panel_applets_manager_matecomponent_factory_activate; - manager_class->factory_deactivate = mate_panel_applets_manager_matecomponent_factory_deactivate; - manager_class->get_applet_info = mate_panel_applets_manager_matecomponent_get_applet_info; - manager_class->get_applet_info_from_old_id = mate_panel_applets_manager_matecomponent_get_applet_info_from_old_id; - manager_class->load_applet = mate_panel_applets_manager_matecomponent_load_applet; - - g_type_class_add_private (class, sizeof (MatePanelAppletsManagerMateComponentPrivate)); -} - - -void -mate_panel_applets_manager_matecomponent_register (GIOModule *module) -{ - mate_panel_applets_manager_matecomponent_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (MATE_PANEL_APPLETS_MANAGER_EXTENSION_POINT_NAME, - PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT, - "matecomponent", - 10); -} diff --git a/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.h b/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.h deleted file mode 100644 index 88741ed8..00000000 --- a/matecomponent/panel-module/mate-panel-applets-manager-matecomponent.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * mate-panel-applets-manager-matecomponent.h - * - * Copyright (C) 2010 Vincent Untz <[email protected]> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#ifndef __MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT_H__ -#define __MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT_H__ - -#include <mate-panel-applets-manager.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#define PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT (mate_panel_applets_manager_matecomponent_get_type ()) -#define MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT, MatePanelAppletsManagerMateComponent)) -#define MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT, MatePanelAppletsManagerMateComponentClass)) -#define PANEL_IS_APPLETS_MANAGER_MATECOMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT)) -#define PANEL_IS_APPLETS_MANAGER_MATECOMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT)) -#define MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_APPLETS_MANAGER_MATECOMPONENT, MatePanelAppletsManagerMateComponentClass)) - -typedef struct _MatePanelAppletsManagerMateComponent MatePanelAppletsManagerMateComponent; -typedef struct _MatePanelAppletsManagerMateComponentClass MatePanelAppletsManagerMateComponentClass; -typedef struct _MatePanelAppletsManagerMateComponentPrivate MatePanelAppletsManagerMateComponentPrivate; - -struct _MatePanelAppletsManagerMateComponentClass { - MatePanelAppletsManagerClass parent_class; -}; - -struct _MatePanelAppletsManagerMateComponent { - MatePanelAppletsManager parent; - - /*< private > */ - MatePanelAppletsManagerMateComponentPrivate *priv; -}; - -GType mate_panel_applets_manager_matecomponent_get_type (void); - -#ifdef __cplusplus -} -#endif - -#endif /* __MATE_PANEL_APPLETS_MANAGER_MATECOMPONENT_H__ */ diff --git a/matecomponent/panel-module/mate-panel-applets-matecomponent-module.c b/matecomponent/panel-module/mate-panel-applets-matecomponent-module.c deleted file mode 100644 index 5713ebc4..00000000 --- a/matecomponent/panel-module/mate-panel-applets-matecomponent-module.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2010 Novell, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program 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 - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Author: Vincent Untz <[email protected]> - */ - -#include "config.h" - -#include <gio/gio.h> - -#include <mate-panel-applets-manager.h> -#include "mate-panel-applets-manager-matecomponent.h" - -void -g_io_module_load (GIOModule *module) -{ - mate_panel_applets_manager_matecomponent_register (module); -} - -void -g_io_module_unload (GIOModule *module) -{ -} - -char ** -g_io_module_query (void) -{ - char *eps[] = { - MATE_PANEL_APPLETS_MANAGER_EXTENSION_POINT_NAME, - NULL - }; - return g_strdupv (eps); -} |