diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | null_applet/MATE_CDPlayerApplet.server.in | 20 | ||||
| -rw-r--r-- | null_applet/MATE_KeyboardApplet.server.in | 22 | ||||
| -rw-r--r-- | null_applet/MATE_MailcheckApplet_Factory.server.in | 20 | ||||
| -rw-r--r-- | null_applet/MATE_NullApplet_Factory.server.in.in | 17 | ||||
| -rw-r--r-- | null_applet/MATE_Panel_WirelessApplet.server.in | 22 | ||||
| -rw-r--r-- | null_applet/Makefile.am | 35 | ||||
| -rw-r--r-- | null_applet/README | 29 | ||||
| -rw-r--r-- | null_applet/null_applet.c | 173 | ||||
| -rw-r--r-- | po/POTFILES.in | 6 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
12 files changed, 1 insertions, 349 deletions
diff --git a/Makefile.am b/Makefile.am index cf0bc376..ca10405a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,6 @@ always_built_SUBDIRS = \ stickynotes \ trashapplet \ command -# null_applet SUBDIRS = \ po \ @@ -69,8 +68,7 @@ DIST_SUBDIRS = \ cpufreq \ invest-applet \ command \ - netspeed \ - null_applet + netspeed EXTRA_DIST = \ m4/ac-define-dir.m4 \ diff --git a/configure.ac b/configure.ac index 9046e5fe..6b8c7d75 100644 --- a/configure.ac +++ b/configure.ac @@ -619,7 +619,6 @@ timerapplet/Makefile timerapplet/org.mate.panel.applet.timer.gschema.xml command/Makefile command/org.mate.panel.applet.command.gschema.xml -null_applet/Makefile netspeed/Makefile netspeed/data/Makefile netspeed/data/org.mate.panel.applet.netspeed.gschema.xml diff --git a/null_applet/MATE_CDPlayerApplet.server.in b/null_applet/MATE_CDPlayerApplet.server.in deleted file mode 100644 index 5865a8bf..00000000 --- a/null_applet/MATE_CDPlayerApplet.server.in +++ /dev/null @@ -1,20 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:MATE_CDPlayerApplet" - type="factory" - location="OAFIID:MATE_NullApplet_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="CD Player (Deprecated)"/> - <oaf_attribute name="description" type="string" _value="Panel applet for playing audio CDs"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="cdplayer"/> - -</oaf_server> - -</oaf_info> diff --git a/null_applet/MATE_KeyboardApplet.server.in b/null_applet/MATE_KeyboardApplet.server.in deleted file mode 100644 index 58f7a612..00000000 --- a/null_applet/MATE_KeyboardApplet.server.in +++ /dev/null @@ -1,22 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:MATE_KeyboardApplet" - type="factory" - location="OAFIID:MATE_NullApplet_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="Keyboard Indicator (Deprecated)"/> - <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/> - <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/> - <oaf_attribute name="bugzilla:other_binaries" type="string" value="mate-keyboard-applet"/> - -</oaf_server> - -</oaf_info> diff --git a/null_applet/MATE_MailcheckApplet_Factory.server.in b/null_applet/MATE_MailcheckApplet_Factory.server.in deleted file mode 100644 index f32a300c..00000000 --- a/null_applet/MATE_MailcheckApplet_Factory.server.in +++ /dev/null @@ -1,20 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:MATE_MailcheckApplet" - type="factory" - location="OAFIID:MATE_NullApplet_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="Inbox Monitor (Deprecated)"/> - <oaf_attribute name="description" type="string" _value="Alert you when new mail arrives"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="Mailcheck Applet"/> - -</oaf_server> - -</oaf_info> diff --git a/null_applet/MATE_NullApplet_Factory.server.in.in b/null_applet/MATE_NullApplet_Factory.server.in.in deleted file mode 100644 index 9efe3523..00000000 --- a/null_applet/MATE_NullApplet_Factory.server.in.in +++ /dev/null @@ -1,17 +0,0 @@ -<oaf_info> - -<!-- null_applet factory --> -<oaf_server iid="OAFIID:MATE_NullApplet_Factory" - type="exe" - location="@LIBEXECDIR@/null_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="Null Applet Factory"/> - <oaf_attribute name="description" type="string" _value="Factory for deprecating applets"/> - -</oaf_server> - -</oaf_info> diff --git a/null_applet/MATE_Panel_WirelessApplet.server.in b/null_applet/MATE_Panel_WirelessApplet.server.in deleted file mode 100644 index 49a20387..00000000 --- a/null_applet/MATE_Panel_WirelessApplet.server.in +++ /dev/null @@ -1,22 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:MATE_Panel_WirelessApplet" - type="factory" - location="OAFIID:MATE_NetstatusApplet_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="Wireless Link Monitor"/> - <oaf_attribute name="description" type="string" _value="Monitor the quality of a wireless network link"/> - <oaf_attribute name="bugzilla:bugzilla" type="string" value="MATE"/> - <oaf_attribute name="bugzilla:product" type="string" value="mate-applets"/> - <oaf_attribute name="bugzilla:component" type="string" value="wireless-applet"/> - <oaf_attribute name="bugzilla:other_binaries" type="string" value="wireless-applet"/> - -</oaf_server> - -</oaf_info> diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am deleted file mode 100644 index 39375de6..00000000 --- a/null_applet/Makefile.am +++ /dev/null @@ -1,35 +0,0 @@ -AM_CPPFLAGS = \ - -I. \ - -I$(srcdir) \ - $(MATE_APPLETS4_CFLAGS) - -libexec_PROGRAMS = null_applet - -null_applet_SOURCES = null_applet.c - -null_applet_LDADD = $(MATE_APPLETS4_LIBS) - -serverdir = $(libdir)/matecomponent/servers -server_in_files = \ - MATE_NullApplet_Factory.server.in \ - MATE_CDPlayerApplet.server.in \ - MATE_MailcheckApplet_Factory.server.in \ - MATE_Panel_WirelessApplet.server.in \ - MATE_KeyboardApplet.server.in -server_DATA = $(server_in_files:.server.in=.server) - -@INTLTOOL_SERVER_RULE@ - -MATE_NullApplet_Factory.server.in: MATE_NullApplet_Factory.server.in.in - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ - -CLEANFILES = MATE_NullApplet_Factory.server.in $(server_DATA) - -EXTRA_DIST = \ - MATE_NullApplet_Factory.server.in.in \ - MATE_CDPlayerApplet.server.in \ - MATE_MailcheckApplet_Factory.server.in \ - MATE_Panel_WirelessApplet.server.in \ - MATE_KeyboardApplet.server.in - --include $(top_srcdir)/git.mk diff --git a/null_applet/README b/null_applet/README deleted file mode 100644 index fc1996c5..00000000 --- a/null_applet/README +++ /dev/null @@ -1,29 +0,0 @@ -What the hell is a Null Applet? -=============================== - -The Null Applet is the Applet Deprecation Applet. It allows us to remove applets -from a users configuration, without them getting cryptic messages about being -unable to resolve things, and getting a raw dump of preferences (the panel likes -to do this). In the future, the null applet will also be useful for when someone -decides not to build one of the optional applets, to prevent them from seeing -the same ugly message. - -How do I add an applet to Null Applet? -====================================== - -Copy the original .server.in.in file over and rename to a .server.in file, -remove the factory, set its location to MATE_NullApplet_Factory and -remove the panel:icon attribute that it doesn't appear in the add to -panel list. - -Why is the Wireless Applet .server file here? -============================================= - -The wireless applet was deprecated in favour of mate-netstatus, but we -still install a .server file of the same name pointing the old applet -id at the netstatus applet. - -Who wrote this abomination? -=========================== - -Blame Davyd Madeley <[email protected]> diff --git a/null_applet/null_applet.c b/null_applet/null_applet.c deleted file mode 100644 index c1a873b0..00000000 --- a/null_applet/null_applet.c +++ /dev/null @@ -1,173 +0,0 @@ -/* -*- mode: C; c-basic-offset: 4 -*- - * Null Applet - The Applet Deprecation Applet - * Copyright (c) 2004, Davyd Madeley - * - * This library 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: - * Davyd Madeley <[email protected]> - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <gtk/gtk.h> -#include <mateconf/mateconf-client.h> -#include <mate-panel-applet.h> - -static const char factory_iid[] = "OAFIID:MATE_NullApplet_Factory"; - -static inline void -insert_oafiids (GHashTable *hash_table) -{ - /* - * Add OAFIID's and descriptions of deprecated applets here - */ - g_hash_table_insert (hash_table, - "OAFIID:MATE_MailcheckApplet", _("Inbox Monitor")); - g_hash_table_insert (hash_table, - "OAFIID:MATE_CDPlayerApplet", _("CD Player")); - g_hash_table_insert (hash_table, - "OAFIID:MATE_MixerApplet_Factory", _("Volume Control")); - g_hash_table_insert (hash_table, - "OAFIID:MATE_MixerApplet", _("Volume Control")); - g_hash_table_insert (hash_table, - "OAFIID:MATE_KeyboardApplet", _("Keyboard Indicator")); -} - -static gboolean already_running; - -static void -response_cb (GtkWidget *dialog, gint arg1, gpointer user_data) -{ - gtk_widget_destroy (dialog); -} - -static char -*get_all_applets (void) -{ - MateConfClient *client; - GError *error; - GSList *list, *l; - char *key, *oafiid, *name; - GHashTable *hash_table; - GString *string; - - error = NULL; - hash_table = g_hash_table_new (g_str_hash, g_str_equal); - insert_oafiids (hash_table); - - string = g_string_new (""); - - client = mateconf_client_get_default (); - - mateconf_client_suggest_sync (client, NULL); - - list = mateconf_client_all_dirs (client, - "/apps/panel/applets", - &error); - - if (error) - { - g_warning ("Error: %s", error->message); - g_error_free (error); - error = NULL; - } - - for (l = list; l; l = l->next) - { - key = g_strdup_printf ("%s/matecomponent_iid", (gchar *)l->data); - oafiid = mateconf_client_get_string (client, key, &error); - if (error) - { - g_warning ("Error: %s", error->message); - g_error_free (error); - error = NULL; - } - g_free (key); - - if (oafiid) - { - name = g_hash_table_lookup (hash_table, oafiid); - if (name) - { - mateconf_client_recursive_unset (client, l->data, - MATECONF_UNSET_INCLUDING_SCHEMA_NAMES, - &error); - if (error) - { - g_warning ("Error: %s", error->message); - g_error_free (error); - error = NULL; - } - g_string_append_printf (string, - " • %s\n", name); - } - g_free (oafiid); - } - g_free (l->data); - } - - g_slist_free (list); - g_hash_table_destroy (hash_table); - - return g_string_free (string, FALSE); -} - -static gboolean -applet_factory (MatePanelApplet *applet, - const char *iid, - gpointer user_data) -{ - char *applet_list; - GtkWidget *dialog; - - if (already_running) - { - return FALSE; - } - already_running = TRUE; - - applet_list = get_all_applets (); - - dialog = gtk_message_dialog_new_with_markup (NULL, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - "<span size=\"large\" weight=\"bold\">%s</span>" - "\n\n%s\n\n%s\n%s\n%s", - _("Some panel items are no longer available"), - _("One or more panel items (also referred to as applets" - ") are no longer available in the MATE desktop."), - _("These items will now be removed from your " - "configuration:"), - applet_list, - _("You will not receive this message again.") - ); - - g_free (applet_list); - - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (response_cb), applet); - - gtk_widget_show_all (dialog); - - return TRUE; -} - -MATE_PANEL_APPLET_MATECOMPONENT_FACTORY (factory_iid, - PANEL_TYPE_APPLET, - "Null-Applet", "0", - applet_factory, NULL) diff --git a/po/POTFILES.in b/po/POTFILES.in index 1b375d20..858fb28e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -62,12 +62,6 @@ multiload/properties.c [type: gettext/gsettings]netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in [type: gettext/ini]netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.in.in netspeed/src/netspeed.c -null_applet/MATE_CDPlayerApplet.server.in -null_applet/MATE_MailcheckApplet_Factory.server.in -null_applet/MATE_NullApplet_Factory.server.in.in -null_applet/MATE_Panel_WirelessApplet.server.in -null_applet/MATE_KeyboardApplet.server.in -null_applet/null_applet.c # NB. these are actually separate files [type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in stickynotes/stickynotes.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index c195953f..7ec2fca5 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -15,6 +15,5 @@ invest-applet/data/Invest_Applet.server.in mini-commander/src/org.mate.applets.MiniCommanderApplet.mate-panel-applet.in mixer/org.mate.applets.MixerApplet.mate-panel-applet.in multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in -null_applet/MATE_NullApplet_Factory.server.in stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in |