From d7fb1cb82c5e29e1a5865045698cd845d0deb42d Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Wed, 12 Feb 2014 16:24:04 +0000 Subject: modem-lights: Remove broken modem-lights applet. It has been broken for some time now so it is time to remove it. If someone is willing to put in the work they can resurrect it from git. --- Makefile.am | 9 - configure.ac | 27 - man/Makefile.am | 1 - man/modemlights_applet.1 | 32 - modemlights/AUTHORS | 4 - modemlights/Makefile.am | 103 -- modemlights/mate-modem-monitor-applet.16.png | Bin 719 -> 0 bytes modemlights/mate-modem-monitor-applet.22.png | Bin 1168 -> 0 bytes modemlights/mate-modem-monitor-applet.24.png | Bin 1221 -> 0 bytes modemlights/mate-modem-monitor-applet.32.png | Bin 2148 -> 0 bytes modemlights/mate-modem-monitor-applet.svg | 1377 -------------------- modemlights/modem-applet-menu.xml | 7 - modemlights/modem-applet.c | 1080 --------------- modemlights/modem-applet.h | 52 - modemlights/modemlights.ui | 219 ---- ...ate.applets.ModemApplet.mate-panel-applet.in.in | 16 - ...mate.panel.applet.ModemAppletFactory.service.in | 3 - po/POTFILES.in | 3 - po/POTFILES.skip | 1 - 19 files changed, 2934 deletions(-) delete mode 100644 man/modemlights_applet.1 delete mode 100644 modemlights/AUTHORS delete mode 100644 modemlights/Makefile.am delete mode 100644 modemlights/mate-modem-monitor-applet.16.png delete mode 100644 modemlights/mate-modem-monitor-applet.22.png delete mode 100644 modemlights/mate-modem-monitor-applet.24.png delete mode 100644 modemlights/mate-modem-monitor-applet.32.png delete mode 100644 modemlights/mate-modem-monitor-applet.svg delete mode 100644 modemlights/modem-applet-menu.xml delete mode 100644 modemlights/modem-applet.c delete mode 100644 modemlights/modem-applet.h delete mode 100644 modemlights/modemlights.ui delete mode 100644 modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in delete mode 100644 modemlights/org.mate.panel.applet.ModemAppletFactory.service.in diff --git a/Makefile.am b/Makefile.am index 0917bb63..6e73a81e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,13 +12,6 @@ if BUILD_LIBMATEWEATHER_APPLETS libmateweather_SUBDIRS = $(libmateweather_applets) endif -modemlights_applets = \ - modemlights - -if APPLET_MODEMLIGHTS -modemlights_SUBDIRS = $(modemlights_applets) -endif - if BUILD_BATTSTAT_APPLET battstat_SUBDIR = battstat endif @@ -51,7 +44,6 @@ always_built_SUBDIRS = \ SUBDIRS = \ po \ $(always_built_SUBDIRS) \ - $(modemlights_SUBDIRS) \ $(gtop_SUBDIRS) \ $(libmateweather_SUBDIRS) \ $(vfs_SUBDIRS) \ @@ -63,7 +55,6 @@ SUBDIRS = \ DIST_SUBDIRS = \ po \ - modemlights \ drivemount \ charpick \ geyes \ diff --git a/configure.ac b/configure.ac index 38ae14ce..78cad4b3 100644 --- a/configure.ac +++ b/configure.ac @@ -163,10 +163,6 @@ dnl -- check for mate-settings-daemon (optional) ----------------------------- PKG_CHECK_MODULES(MATE_SETTINGS_DAEMON, mate-settings-daemon, HAVE_MATE_SETTINGS_DAEMON=yes, HAVE_MATE_SETTINGS_DAEMON=no) -if test "x$HAVE_MATE_SETTINGS_DAEMON" = "xno"; then - AC_MSG_WARN([mate-settings-daemon DBUS API is required to build modem-applet.]) -fi - AC_SUBST(MATE_SETTINGS_DAEMON_CFLAGS) AC_SUBST(MATE_SETTINGS_DAEMON_LIBS) @@ -459,33 +455,12 @@ if test "x$APPLET_ACCESSX" = "xtrue"; then fi CPPFLAGS=$savecppflags -dnl *************************************************************************** -dnl *** modemlights applet check *** -dnl *************************************************************************** - SU_TOOL= HAVE_LIBUTIL= AC_PATH_PROG(SU_TOOL, su) AC_CHECK_LIB(util, forkpty, HAVE_LIBUTIL=true, HAVE_LIBUTIL=false) -dnl *** -dnl *** Modem lights does not currently compile. It needs to be ported to a -dnl *** modern mate-system-tools backend. -dnl *** -dnl if test "x$HAVE_LIBUTIL" = "xtrue" -a "x$HAVE_MATE_SETTINGS_DAEMON" = "xyes"; then -dnl MODEMLIGHTS_LIBS=" -lutil" -dnl AC_SUBST(MODEMLIGHTS_LIBS) -dnl AC_DEFINE_UNQUOTED(STB_SCRIPTS_DIR, "$STB_SCRIPTS_DIR", [System tools backends]) -dnl AC_DEFINE_UNQUOTED(SU_PATH, "${SU_TOOL}", [su executable path]) -dnl BUILD_MODEM_LIGHTS=yes -dnl else - AC_MSG_WARN([*** modemlights applet will not be built ***]) - BUILD_MODEM_LIGHTS=no -dnl fi - -AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes") - dnl *************************************************************************** dnl *** cpufreq applet check *** dnl *************************************************************************** @@ -669,7 +644,6 @@ accessx-status/docs/Makefile accessx-status/pixmaps/Makefile drivemount/Makefile drivemount/help/Makefile -modemlights/Makefile multiload/Makefile multiload/docs/Makefile charpick/Makefile @@ -732,7 +706,6 @@ mate-applets-$VERSION configure summary: - geyes always - mateweather $build_libmateweather_applets - invest-applet $HAVE_PYGOBJECT - - modemlights $BUILD_MODEM_LIGHTS - multiload $build_gtop_applets - stickynotes $enable_stickynotes - timerapplet $HAVE_LIBNOTIFY diff --git a/man/Makefile.am b/man/Makefile.am index ffa87017..b863b2cb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -8,7 +8,6 @@ man_MANS = \ mateweather.1 \ mini_commander_applet.1 \ mixer_applet.1 \ - modemlights_applet.1 \ multiload_applet.1 \ screenshooter_applet.1 \ sound-monitor_applet.1 \ diff --git a/man/modemlights_applet.1 b/man/modemlights_applet.1 deleted file mode 100644 index 50ba9e23..00000000 --- a/man/modemlights_applet.1 +++ /dev/null @@ -1,32 +0,0 @@ -.\" This manpage has been automatically generated by docbook2man -.\" from a DocBook document. This tool can be found at: -.\" -.\" Please send any bug reports, improvements, comments, patches, -.\" etc. to Steve Cheng . -.TH "MODEMLIGHTS_APPLET" "1" "10 februar 2002" "" "" -.SH NAME -modemlights_applet \- Modem Lights applet for the MATE panel. -.SH SYNOPSIS - -\fBmodemlights_applet\fR [ \fB--activate-goad-server \fI[=GOAD_ID]\fB\fR ] - -.SH "DESCRIPTION" -.PP -\fBmodemlights_applet\fR This applet can be used to tell if -your modem is working, and to track its behavior and performance. It -can also be configured to call a separate script or program to have -your modem connect and disconnect when you click on the button with -the single green light. -.PP -To add this applet to a Panel, right-click on the Panel and -choose Applets->Network->Modem Lights -.SH "OPTIONS" -.TP -\fB--activate-goad-server\fR -(Internal use only) GOAD server ID to activate. - -GOAD_ID is usually the applet name [\fBmodemlights_applet\fR] -.SH "AUTHOR" -.PP -This manual page was written by Christian Marillat for -the Debian GNU/Linux system (but may be used by others). diff --git a/modemlights/AUTHORS b/modemlights/AUTHORS deleted file mode 100644 index 274105a8..00000000 --- a/modemlights/AUTHORS +++ /dev/null @@ -1,4 +0,0 @@ -Carlos Garnacho - -The Old Applet: - John Ellis diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am deleted file mode 100644 index 121620b8..00000000 --- a/modemlights/Makefile.am +++ /dev/null @@ -1,103 +0,0 @@ -#SUBDIRS = docs - -AM_CPPFLAGS = -I. -I$(srcdir) \ - -DMODEM_MENU_UI_DIR=\""$(uidir)"\" \ - $(MATE_APPLETS4_CFLAGS) - -libexec_PROGRAMS = modem_applet - -modem_applet_SOURCES = \ - modem-applet.c \ - modem-applet.h - -modem_applet_LDADD = \ - $(MATE_APPLETS4_LIBS) \ - $(MODEMLIGHTS_LIBS) - -uidir = $(datadir)/mate-2.0/ui -ui_DATA = modem-applet-menu.xml - - -appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.ModemApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) - -$(applet_in_files): $(applet_in_files).in Makefile - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ - $< > $@ - -%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - -servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.ModemAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.ModemAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) - -builder_DATA = modemlights.ui - -icons = \ - mate-modem-monitor-applet.svg \ - mate-modem-monitor-applet.16.png \ - mate-modem-monitor-applet.32.png \ - mate-modem-monitor-applet.22.png \ - mate-modem-monitor-applet.24.png - -EXTRA_DIST = \ - org.mate.applets.ModemApplet.mate-panel-applet.in.in \ - $(service_in_files) \ - $(icons) \ - $(builder_DATA) \ - $(ui_DATA) - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor - -uninstall-local: - for icon in $(icons); do \ - SIZE=`echo $$icon | cut -d. -f2`; \ - FILE=`echo $$icon | cut -d. -f1,3`; \ - if [ "$$SIZE" = "svg" ]; then \ - SIZE="scalable"; \ - FILE="$$FILE.svg"; \ - else \ - SIZE="$${SIZE}x$${SIZE}"; \ - fi; \ - rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ - done - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - -install-data-local: - for icon in $(icons); do \ - SIZE=`echo $$icon | cut -d. -f2`; \ - FILE=`echo $$icon | cut -d. -f1,3`; \ - if [ "$$SIZE" = "svg" ]; then \ - SIZE="scalable"; \ - FILE="$$FILE.svg"; \ - else \ - SIZE="$${SIZE}x$${SIZE}"; \ - fi; \ - mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ - done - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - --include $(top_srcdir)/git.mk diff --git a/modemlights/mate-modem-monitor-applet.16.png b/modemlights/mate-modem-monitor-applet.16.png deleted file mode 100644 index 17bd8f36..00000000 Binary files a/modemlights/mate-modem-monitor-applet.16.png and /dev/null differ diff --git a/modemlights/mate-modem-monitor-applet.22.png b/modemlights/mate-modem-monitor-applet.22.png deleted file mode 100644 index 455bbeb0..00000000 Binary files a/modemlights/mate-modem-monitor-applet.22.png and /dev/null differ diff --git a/modemlights/mate-modem-monitor-applet.24.png b/modemlights/mate-modem-monitor-applet.24.png deleted file mode 100644 index a1d39a3a..00000000 Binary files a/modemlights/mate-modem-monitor-applet.24.png and /dev/null differ diff --git a/modemlights/mate-modem-monitor-applet.32.png b/modemlights/mate-modem-monitor-applet.32.png deleted file mode 100644 index 11714f6c..00000000 Binary files a/modemlights/mate-modem-monitor-applet.32.png and /dev/null differ diff --git a/modemlights/mate-modem-monitor-applet.svg b/modemlights/mate-modem-monitor-applet.svg deleted file mode 100644 index f5945111..00000000 --- a/modemlights/mate-modem-monitor-applet.svg +++ /dev/null @@ -1,1377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Ulisse Perusin - - - Modem - - - - modem - - - - - Lapo Calamandrei - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - # - 0 - * - - - diff --git a/modemlights/modem-applet-menu.xml b/modemlights/modem-applet-menu.xml deleted file mode 100644 index 7e1d0e0a..00000000 --- a/modemlights/modem-applet-menu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/modemlights/modem-applet.c b/modemlights/modem-applet.c deleted file mode 100644 index cd0a05c3..00000000 --- a/modemlights/modem-applet.c +++ /dev/null @@ -1,1080 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ -/* Copyright (C) 2004 Carlos Garnacho - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Authors: Carlos Garnacho Parro - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include -#include -#ifdef HAVE_PTY_H -#include -#endif -#include -#include -#include -#include -#include -#include - -#ifdef __FreeBSD__ -#include -#include -#include -#endif - -#include "modem-applet.h" - -#define MODEM_APPLET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MODEM_APPLET, ModemAppletPrivate)) -#define NETWORK_TOOL "network-admin" -#define END_OF_REQUEST "\n" -#define BUF_SIZE 1024 - -typedef void (*DirectiveCallback) (ModemApplet*, xmlDoc*); -typedef struct _BackendDirective BackendDirective; -typedef struct _ModemAppletPrivate ModemAppletPrivate; - -struct _ModemAppletPrivate -{ - /* applet UI stuff */ - GtkBuilder *builder; - GtkIconTheme *icon_theme; - GdkPixbuf *icon; - GtkWidget *image; - GtkActionGroup *action_group; - - /* auth dialog */ - GtkWidget *auth_dialog; - GtkWidget *auth_dialog_label; - GtkWidget *auth_dialog_entry; - - /* report window */ - GtkWidget *report_window; - GtkWidget *report_window_image; - GtkWidget *report_window_progress; - - guint directives_id; - guint progress_id; - guint tooltip_id; - guint info_id; - guint timeout_id; - - /* for communicating with the backend */ - gint config_id; - gint pid; - int read_fd; - int write_fd; - FILE *read_stream; - FILE *write_stream; - GSList *directives; - gboolean directive_running; - - /* interface data */ - gboolean configured; /* is configured? */ - gboolean enabled; /* is enabled? */ - gboolean is_isdn; /* is an isdn device? */ - gchar *dev; /* device name */ - gchar *lock_file; /* lock file */ - - gboolean has_root; -}; - -struct _BackendDirective -{ - DirectiveCallback callback; - GSList *directive; - gboolean show_report; -}; - -static void modem_applet_class_init (ModemAppletClass *class); -static void modem_applet_init (ModemApplet *applet); -static void modem_applet_finalize (GObject *object); - -static gboolean update_tooltip (ModemApplet *applet); -static gboolean dispatch_directives (ModemApplet *applet); -static gboolean update_info (ModemApplet *applet); - -static void modem_applet_change_size (MatePanelApplet *applet, guint size); - -static void modem_applet_change_background (MatePanelApplet *app, - MatePanelAppletBackgroundType type, - GdkColor *colour, - GdkPixmap *pixmap); - -static void on_modem_applet_about_clicked (GtkAction *action, - ModemApplet *applet); -static void on_modem_applet_activate (GtkAction *action, - ModemApplet *applet); -static void on_modem_applet_deactivate (GtkAction *action, - ModemApplet *applet); -static void on_modem_applet_properties_clicked (GtkAction *action, - ModemApplet *applet); -static void on_modem_applet_help_clicked (GtkAction *action, - ModemApplet *applet); - -static void launch_backend (ModemApplet *applet, - gboolean root_auth); -static void shutdown_backend (ModemApplet *applet, - gboolean backend_alive, - gboolean already_waiting); - -static gpointer parent_class; - -static const GtkActionEntry menu_actions[] = { - { "Activate", GTK_STOCK_EXECUTE, N_("_Activate"), - NULL, NULL, - G_CALLBACK (on_modem_applet_activate) }, - { "Deactivate", GTK_STOCK_STOP, N_("_Deactivate"), - NULL, NULL, - G_CALLBACK (on_modem_applet_deactivate) }, - { "Properties", GTK_STOCK_PROPERTIES, N_("_Properties"), - NULL, NULL, - G_CALLBACK (on_modem_applet_properties_clicked) }, - { "Help", GTK_STOCK_HELP, N_("_Help"), - NULL, NULL, - G_CALLBACK (on_modem_applet_help_clicked) }, - { "About", GTK_STOCK_ABOUT, N_("_About"), - NULL, NULL, - G_CALLBACK (on_modem_applet_about_clicked) } -}; - -G_DEFINE_TYPE (ModemApplet, modem_applet, PANEL_TYPE_APPLET) - -static void -modem_applet_class_init (ModemAppletClass *class) -{ - GObjectClass *object_class; - MatePanelAppletClass *applet_class; - - object_class = G_OBJECT_CLASS (class); - applet_class = MATE_PANEL_APPLET_CLASS (class); - parent_class = g_type_class_peek_parent (class); - - object_class->finalize = modem_applet_finalize; - applet_class->change_size = modem_applet_change_size; - applet_class->change_background = modem_applet_change_background; - - g_type_class_add_private (object_class, sizeof (ModemAppletPrivate)); -} - -static void -modem_applet_init (ModemApplet *applet) -{ - ModemAppletPrivate *priv; - GdkPixbuf *pixbuf; - - g_set_application_name ( _("Modem Monitor")); - - priv = MODEM_APPLET_GET_PRIVATE (applet); - - priv->builder = gtk_builder_new (); - gtk_builder_add_from_file (priv->builder, GTK_BUILDERDIR "/modemlights.ui", NULL); - priv->icon = NULL; - priv->icon_theme = gtk_icon_theme_get_default (); - priv->image = gtk_image_new (); - - priv->auth_dialog = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog")); - priv->auth_dialog_label = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_label")); - priv->auth_dialog_entry = GTK_WIDGET (gtk_builder_get_object (priv->builder, "auth_dialog_entry")); - - priv->report_window = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window")); - priv->report_window_image = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window_image")); - priv->report_window_progress = GTK_WIDGET (gtk_builder_get_object (priv->builder, "report_window_progress")); - - g_signal_connect (G_OBJECT (priv->report_window), "delete-event", - G_CALLBACK (gtk_widget_hide), NULL); - - pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "mate-modem-monitor-applet", 48, 0, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf); - g_object_unref (pixbuf); - - priv->configured = FALSE; - priv->enabled = FALSE; - priv->dev = NULL; - priv->lock_file = NULL; - - priv->has_root = FALSE; - - priv->directives = NULL; - priv->directives_id = g_timeout_add (250, (GSourceFunc) dispatch_directives, applet); - priv->directive_running = FALSE; - priv->tooltip_id = g_timeout_add_seconds (1, (GSourceFunc) update_tooltip, applet); - - launch_backend (applet, FALSE); - gtk_container_add (GTK_CONTAINER (applet), priv->image); -} - -static void -modem_applet_finalize (GObject *object) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (object); - - if (priv) - { - shutdown_backend (MODEM_APPLET (object), TRUE, TRUE); - - gtk_widget_destroy (priv->auth_dialog); - gtk_widget_destroy (priv->report_window); - g_object_unref (priv->icon); - g_object_unref (priv->action_group); - - g_free (priv->dev); - g_free (priv->lock_file); - } - - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); -} - -static void -modem_applet_change_size (MatePanelApplet *applet, - guint size) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - - if (priv->icon) - g_object_unref (priv->icon); - - /* this might be too much overload, maybe should we get just one icon size and scale? */ - priv->icon = gtk_icon_theme_load_icon (priv->icon_theme, - "mate-modem", size, 0, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), priv->icon); -} - -static void -modem_applet_change_background (MatePanelApplet *app, - MatePanelAppletBackgroundType type, - GdkColor *colour, - GdkPixmap *pixmap) -{ - ModemApplet *applet = MODEM_APPLET (app); - GtkRcStyle *rc_style; - GtkStyle *style; - - /* reset style */ - gtk_widget_set_style (GTK_WIDGET (applet), NULL); - rc_style = gtk_rc_style_new (); - gtk_widget_modify_style (GTK_WIDGET (applet), rc_style); - g_object_unref (rc_style); - - switch (type) - { - case PANEL_NO_BACKGROUND: - break; - case PANEL_COLOR_BACKGROUND: - gtk_widget_modify_bg (GTK_WIDGET (applet), - GTK_STATE_NORMAL, colour); - break; - case PANEL_PIXMAP_BACKGROUND: - style = gtk_style_copy (GTK_WIDGET (applet)->style); - - 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 (GTK_WIDGET (applet), style); - g_object_unref (style); - break; - } -} - -static gboolean -pulse_progressbar (GtkWidget *progressbar) -{ - gtk_progress_bar_pulse (GTK_PROGRESS_BAR (progressbar)); - return TRUE; -} - -/* XML manipulation functions */ -static xmlNodePtr -get_root_node (xmlDoc *doc) -{ - return xmlDocGetRootElement (doc); -} - -static xmlNodePtr -find_first_element (xmlNodePtr node, const gchar *name) -{ - xmlNodePtr n; - - g_return_val_if_fail (node != NULL, NULL); - g_return_val_if_fail (name != NULL, NULL); - - for (n = node->children; n; n = n->next) - if (n->name && (strcmp (name, (char *) n->name) == 0)) - break; - - return n; -} - -static xmlNodePtr -find_next_element (xmlNodePtr node, const gchar *name) -{ - xmlNodePtr n; - - g_return_val_if_fail (node != NULL, NULL); - g_return_val_if_fail (name != NULL, NULL); - - for (n = node->next; n; n = n->next) - if (n->name && (strcmp (name, (char *) n->name) == 0)) - break; - - return n; -} - -static guchar * -element_get_attribute (xmlNodePtr node, const gchar *attribute) -{ - xmlAttrPtr a; - - g_return_val_if_fail (node != NULL, NULL); - a = node->properties; - - while (a) - { - if (a->name && (strcmp ((char *) a->name, attribute) == 0)) - return xmlNodeGetContent (a->children); - - a = a->next; - } - - return NULL; -} - -static guchar * -element_get_child_content (xmlNodePtr node, const gchar *tag) -{ - xmlNodePtr child, n; - - child = find_first_element (node, tag); - if (!child) - return NULL; - - for (n = child->children; n; n = n->next) - if (n->type == XML_TEXT_NODE) - return xmlNodeGetContent (n); - - return NULL; -} - -static xmlNodePtr -find_dialup_interface_node (xmlNodePtr root) -{ - xmlNodePtr node; - gchar *type; - - node = find_first_element (root, "interface"); - - while (node) - { - type = (char *) element_get_attribute (node, "type"); - - if (type && (strcmp (type, "modem") == 0 || strcmp (type, "isdn") == 0)) - { - g_free (type); - return node; - } - - g_free (type); - node = find_next_element (node, "interface"); - } - - return NULL; -} - -/* backend communication functions */ -static gchar * -compose_directive_string (GSList *directive) -{ - GString *dir; - gchar *arg, *s, *str; - GSList *elem; - - elem = directive; - dir = g_string_new (""); - - while (elem) - { - arg = elem->data; - - for (s = arg; *s; s++) - { - /* escape needed chars */ - if ((*s == '\\') || - ((*s == ':') && (* (s + 1) == ':'))) - g_string_append_c (dir, '\\'); - - g_string_append_c (dir, *s); - } - - g_string_append (dir, "::"); - elem = elem->next; - } - - g_string_append_c (dir, '\n'); - - str = dir->str; - g_string_free (dir, FALSE); - - return str; -} - -static void -poll_backend (ModemAppletPrivate *priv) -{ - struct pollfd fd; - - fd.fd = priv->read_fd; - fd.events = POLLIN || POLLPRI; - - while (poll (&fd, 1, 100) <= 0) - { - while (gtk_events_pending ()) - gtk_main_iteration (); - } -} - -static xmlDoc* -read_xml (ModemApplet *applet, gboolean show_report) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gchar buffer[BUF_SIZE], *s; - GString *str; - xmlDoc *doc = NULL; - gboolean backend_alive; - - str = g_string_new (""); - backend_alive = (waitpid (priv->pid, NULL, WNOHANG) == 0); - - /* if show_report, create pulse timeout and show window */ - if (show_report) - { - priv->progress_id = g_timeout_add (200, (GSourceFunc) pulse_progressbar, priv->report_window_progress); - gtk_window_set_screen (GTK_WINDOW (priv->report_window), gtk_widget_get_screen (GTK_WIDGET (applet))); - gtk_widget_show (priv->report_window); - } - - while (backend_alive && !g_strrstr (str->str, END_OF_REQUEST)) - { - poll_backend (priv); - fgets (buffer, BUF_SIZE, priv->read_stream); - g_string_append (str, buffer); - - while (gtk_events_pending ()) - gtk_main_iteration (); - - backend_alive = (waitpid (priv->pid, NULL, WNOHANG) == 0); - } - - /* if show_report, hide window and so */ - if (show_report) - { - g_source_remove (priv->progress_id); - priv->progress_id = 0; - gtk_widget_hide (priv->report_window); - } - - s = str->str; - - while (*s && (*s != '<')) - s++; - - if (strcmp (s, END_OF_REQUEST) != 0) - doc = xmlParseDoc ((xmlChar *) s); - - g_string_free (str, TRUE); - - return doc; -} - -static void -queue_directive (ModemApplet *applet, - DirectiveCallback callback, - gboolean show_report, - const gchar *dir, - ...) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - BackendDirective *directive; - GSList *list = NULL; - va_list ap; - gchar *arg; - - list = g_slist_prepend (list, g_strdup (dir)); - va_start (ap, dir); - - while ((arg = va_arg (ap, gchar *)) != NULL) - list = g_slist_prepend (list, g_strdup (arg)); - - va_end (ap); - list = g_slist_reverse (list); - - directive = g_new0 (BackendDirective, 1); - directive->callback = callback; - directive->directive = list; - directive->show_report = show_report; - - priv->directives = g_slist_append (priv->directives, directive); -} - -static gboolean -dispatch_directives (ModemApplet *applet) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - BackendDirective *directive; - xmlDoc *doc; - gchar *dir; - GSList *elem; - - if (priv->directive_running) - return TRUE; - - priv->directive_running = TRUE; - elem = priv->directives; - - while (elem) - { - directive = elem->data; - - dir = compose_directive_string (directive->directive); - fputs (dir, priv->write_stream); - g_free (dir); - - doc = read_xml (applet, directive->show_report); - - if (directive->callback) - directive->callback (applet, doc); - - if (doc) - xmlFreeDoc (doc); - - g_slist_foreach (directive->directive, (GFunc) g_free, NULL); - g_slist_free (directive->directive); - - elem = elem->next; - } - - g_slist_foreach (priv->directives, (GFunc) g_free, NULL); - g_slist_free (priv->directives); - priv->directives = NULL; - priv->directive_running = FALSE; - - return TRUE; -} - -static void -shutdown_backend (ModemApplet *applet, gboolean backend_alive, gboolean already_waiting) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - - if (priv->info_id) - { - g_source_remove (priv->info_id); - priv->info_id = 0; - } - - if (priv->timeout_id) - { - g_source_remove (priv->timeout_id); - priv->timeout_id = 0; - } - - if (priv->tooltip_id) - { - g_source_remove (priv->tooltip_id); - priv->tooltip_id = 0; - } - - if (backend_alive) - kill (priv->pid, 9); - - if (!already_waiting) - { - /* don't leave zombies */ - while (waitpid (priv->pid, NULL, WNOHANG) <= 0) - { - usleep (2000); - - while (gtk_events_pending ()) - gtk_main_iteration (); - } - } - - /* close remaining streams and fds */ - fclose (priv->read_stream); - fclose (priv->write_stream); - close (priv->read_fd); - close (priv->write_fd); -} - -/* functions for extracting the interface information from the XML */ -static void -update_popup_buttons (ModemApplet *applet) -{ - GtkAction *action; - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - - action = gtk_action_group_get_action (priv->action_group, "Activate"); - gtk_action_set_sensitive (action, priv->configured && !priv->enabled); - - action = gtk_action_group_get_action (priv->action_group, "Deactivate"); - gtk_action_set_sensitive (action, priv->configured && priv->enabled); -} - -static void -get_interface_data (ModemApplet *applet, xmlNodePtr iface) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - xmlNodePtr configuration; - gchar *text, *device; - - g_return_if_fail (iface != NULL); - - text = (char *) element_get_child_content (iface, "enabled"); - priv->enabled = (*text == '1'); - g_free (text); - - g_free (priv->dev); - priv->dev = (char *) element_get_child_content (iface, "dev"); - - g_free (priv->lock_file); - configuration = find_first_element (iface, "configuration"); - - if (configuration) - { - priv->configured = TRUE; - text = (char *) element_get_child_content (configuration, "serial_port"); - - if (text) - { - /* Modem device */ - device = strrchr (text, '/'); - priv->lock_file = g_strdup_printf ("/var/lock/LCK..%s", device + 1); - g_free (text); - - priv->is_isdn = FALSE; - } - else - { - /* isdn device */ - priv->lock_file = g_strdup ("/var/lock/LCK..capi_0"); - priv->is_isdn = TRUE; - } - } - else - { - priv->lock_file = NULL; - priv->configured = FALSE; - } -} - -static gint -get_connection_time (const gchar *lock_file) -{ - struct stat st; - - if (stat (lock_file, &st) == 0) - return (gint) (time (NULL) - st.st_mtime); - - return 0; -} - -static gboolean -update_tooltip (ModemApplet *applet) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gchar *text; - gint t, t1, t2; - - if (priv->enabled) - { - if (!priv->lock_file) - text = g_strdup (_("Connection active, but could not get connection time")); - else - { - t = get_connection_time (priv->lock_file); - - if (t < (60 * 60 * 24)) - { - t1 = t / 3600; /* hours */ - t2 = (t - (t1 * 3600)) / 60; /* minutes */ - } - else - { - t1 = t / (3600 * 24); /* days */ - t2 = (t - (t1 * 3600 * 24)) / 3600; /* hours */ - } - - text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2); - } - } - else - text = g_strdup (_("Not connected")); - - gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text); - g_free (text); - - return TRUE; -} - -static void -rerun_backend_callback (ModemApplet *applet, xmlDoc *doc) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gchar *text, *password; - gint response; - gboolean enable; - - shutdown_backend (applet, FALSE, FALSE); - launch_backend (applet, TRUE); - - enable = !priv->enabled; - - text = (enable) ? - _("To connect to your Internet service provider, you need administrator privileges") : - _("To disconnect from your Internet service provider, you need administrator privileges"); - - gtk_label_set_text (GTK_LABEL (priv->auth_dialog_label), text); - gtk_window_set_screen (GTK_WINDOW (priv->auth_dialog), - gtk_widget_get_screen (GTK_WIDGET (applet))); - - gtk_widget_grab_focus (priv->auth_dialog_entry); - response = gtk_dialog_run (GTK_DIALOG (priv->auth_dialog)); - gtk_widget_hide (priv->auth_dialog); - password = (gchar *) gtk_entry_get_text (GTK_ENTRY (priv->auth_dialog_entry)); - - if (response == GTK_RESPONSE_OK) - { - - password = (gchar *) gtk_entry_get_text (GTK_ENTRY (priv->auth_dialog_entry)); - fputs (password, priv->write_stream); - fputs ("\n", priv->write_stream); - - while (fflush (priv->write_stream) != 0); - - queue_directive (applet, NULL, enable, - "enable_iface", priv->dev, (enable) ? "1" : "0", NULL); - } - else - { - shutdown_backend (applet, TRUE, FALSE); - launch_backend (applet, FALSE); - } - - /* stab the root password */ - memset (password, ' ', sizeof (password)); - gtk_entry_set_text (GTK_ENTRY (priv->auth_dialog_entry), ""); -} - -static void -update_info_callback (ModemApplet *applet, xmlDoc *doc) -{ - xmlNodePtr iface; - - if (!doc) - return; - - iface = find_dialup_interface_node (get_root_node (doc)); - if (!iface) - return; - - get_interface_data (applet, iface); - update_popup_buttons (applet); -} - -static gboolean -update_info (ModemApplet *applet) -{ - queue_directive (applet, update_info_callback, - FALSE, "get", NULL); - return TRUE; -} - -static gboolean -check_backend (ModemApplet *applet) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gint status, pid = -1; - GtkWidget *dialog; - - pid = waitpid (priv->pid, &status, WNOHANG); - - if (pid != 0) - { - if (errno == ECHILD || ((WIFEXITED (status)) && (WEXITSTATUS (status)) && (WEXITSTATUS(status) < 255))) - { - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_CLOSE, - _("The entered password is invalid")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Check that you have typed it correctly and that " - "you haven't activated the \"caps lock\" key")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } - - priv->timeout_id = 0; - shutdown_backend (applet, FALSE, TRUE); - launch_backend (applet, FALSE); - - return FALSE; - } - - return TRUE; -} - -static void -launch_backend (ModemApplet *applet, gboolean root_auth) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gchar *non_auth_args[] = { STB_SCRIPTS_DIR "/network-conf", NULL }; - gchar *auth_args[] = { SU_PATH, "-c", STB_SCRIPTS_DIR "/network-conf", NULL }; - gchar **args; - int p[2]; - - pipe (p); - priv->pid = forkpty (&priv->write_fd, NULL, NULL, NULL); - args = (root_auth) ? auth_args : non_auth_args; - - if (priv->pid < 0) - g_warning ("Could not spawn GST backend"); - else - { - if (priv->pid == 0) - { - /* child process */ - unsetenv("LC_ALL"); - unsetenv("LC_MESSAGES"); - unsetenv("LANG"); - unsetenv("LANGUAGE"); - - dup2 (p[1], 1); - dup2 (p[1], 2); - close (p[0]); - - execv (args[0], args); - exit (255); - } - else - { - close (p[1]); - - priv->read_fd = p[0]; - priv->timeout_id = g_timeout_add_seconds (1, (GSourceFunc) check_backend, applet); - priv->info_id = g_timeout_add_seconds (3, (GSourceFunc) update_info, applet); - priv->read_stream = fdopen (priv->read_fd, "r"); - priv->write_stream = fdopen (priv->write_fd, "w"); - priv->has_root = root_auth; - - setvbuf (priv->read_stream, NULL, _IONBF, 0); - fcntl (priv->read_fd, F_SETFL, 0); - } - } -} - -static gboolean -launch_config_tool (GdkScreen *screen, gboolean is_isdn) -{ - gchar *argv[4], *application; - gboolean ret; - - application = g_find_program_in_path (NETWORK_TOOL); - - if (!application) - return FALSE; - - argv[0] = application; - argv[1] = "--configure-type"; - argv[2] = (is_isdn) ? "isdn" : "modem"; - argv[3] = NULL; - - ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, - NULL, NULL, NULL, NULL); - g_free (application); - return ret; -} - -static void -toggle_interface_non_root (ModemApplet *applet, gboolean enable) -{ - queue_directive (applet, rerun_backend_callback, - FALSE, "end", NULL); -} - -static void -toggle_interface_root (ModemApplet *applet, gboolean enable) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - GtkWidget *dialog; - gchar *text; - - text = (enable) ? - _("Do you want to connect?") : - _("Do you want to disconnect?"); - - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - text); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - (enable) ? _("C_onnect") : _("_Disconnect"), - GTK_RESPONSE_OK, NULL); - gtk_window_set_screen (GTK_WINDOW (dialog), - gtk_widget_get_screen (GTK_WIDGET (applet))); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) - queue_directive (applet, NULL, enable, - "enable_iface", priv->dev, (enable) ? "1" : "0", NULL); - - gtk_widget_destroy (dialog); -} - -static void -toggle_interface (ModemApplet *applet, gboolean enable) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - - if (priv->has_root) - toggle_interface_root (applet, enable); - else - toggle_interface_non_root (applet, enable); -} - -static void -on_modem_applet_activate (GtkAction *action, - ModemApplet *applet) -{ - toggle_interface (applet, TRUE); -} - -static void -on_modem_applet_deactivate (GtkAction *action, - ModemApplet *applet) -{ - toggle_interface (applet, FALSE); -} - -static void -on_modem_applet_properties_clicked (GtkAction *action, - ModemApplet *applet) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - GdkScreen *screen; - GtkWidget *dialog; - - screen = gtk_widget_get_screen (GTK_WIDGET (applet)); - - if (!launch_config_tool (screen, priv->is_isdn)) - { - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - _("Could not launch network configuration tool")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Check that it's installed in the correct path " - "and that it has the correct permissions")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - } -} - -static void -on_modem_applet_about_clicked (GtkAction *action, - ModemApplet *applet) -{ - const gchar *authors[] = { - "Carlos Garnacho Parro ", - NULL - }; -/* - const gchar *documenters[] = { - NULL - }; -*/ - gtk_show_about_dialog (NULL, - "version", VERSION, - "copyright", "Copyright \xC2\xA9 2004 Free Software Foundation. Inc.", - "comments", _("Applet for activating and monitoring a dial-up network connection."), - "authors", authors, - /* "documenters", documenters, */ - "translator-credits", _("translator-credits"), - "logo_icon_name", "mate-modem-monitor-applet", - NULL); -} - -static void -on_modem_applet_help_clicked (GtkAction *action, - ModemApplet *applet) -{ - gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), - "help:modemlights", - gtk_get_current_event_time (), - NULL); -} - -static gboolean -modem_applet_fill (ModemApplet *applet) -{ - ModemAppletPrivate *priv = MODEM_APPLET_GET_PRIVATE (applet); - gchar *ui_path; - - g_return_val_if_fail (PANEL_IS_APPLET (applet), FALSE); - - gtk_widget_show_all (GTK_WIDGET (applet)); - - priv->action_group = gtk_action_group_new ("ModemLights Applet Actions"); - gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE); - gtk_action_group_add_actions (priv->action_group, - menu_actions, - G_N_ELEMENTS (menu_actions), - applet); - update_popup_buttons (applet); - ui_path = g_build_filename (MODEM_MENU_UI_DIR, "modem-applet-menu.xml", NULL); - mate_panel_applet_setup_menu_from_file (MATE_PANEL_APPLET (applet), - ui_path, priv->action_group); - g_free (ui_path); - - return TRUE; -} - -static gboolean -modem_applet_factory (MatePanelApplet *applet, - const gchar *iid, - gpointer data) -{ - gboolean retval = FALSE; - - if (!strcmp (iid, "ModemLightsApplet")) - retval = modem_applet_fill (MODEM_APPLET (applet)); - - return retval; -} - -MATE_PANEL_APPLET_OUT_PROCESS_FACTORY ("ModemAppletFactory", - TYPE_MODEM_APPLET, - "modem", - modem_applet_factory, - NULL) diff --git a/modemlights/modem-applet.h b/modemlights/modem-applet.h deleted file mode 100644 index 77a3f4e3..00000000 --- a/modemlights/modem-applet.h +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ -/* Copyright (C) 2004 Carlos Garnacho - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Authors: Carlos Garnacho Parro - */ - -#ifndef __MODEM_APPLET_H -#define __MODEM_APPLET_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include - -#define TYPE_MODEM_APPLET (modem_applet_get_type ()) -#define MODEM_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MODEM_APPLET, ModemApplet)) -#define MODEM_APPLET_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TYPE_MODEM_APPLET, ModemAppletClass)) -#define IS_MODEM_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MODEM_APPLET)) -#define IS_MODEM_APPLET_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_MODEM_APPLET)) -#define MODEM_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MODEM_APPLET, ModemAppletClass)) - -typedef struct _ModemApplet ModemApplet; -typedef struct _ModemAppletClass ModemAppletClass; - -struct _ModemApplet { - MatePanelApplet parent; -}; - -struct _ModemAppletClass { - MatePanelAppletClass parent_class; -}; - -#ifdef __cplusplus -} -#endif - -#endif /* __MODEM_APPLET_H */ diff --git a/modemlights/modemlights.ui b/modemlights/modemlights.ui deleted file mode 100644 index f2161106..00000000 --- a/modemlights/modemlights.ui +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - Enter password - False - True - center - dialog - - - True - - - True - 7 - 12 - - - True - 0 - 0 - mate-stock-authentication - 6 - - - False - False - 0 - - - - - True - 6 - - - True - 0 - Root password required - - - - - - - False - False - 0 - - - - - True - True - 0 - True - True - - - False - False - 1 - - - - - True - 12 - - - True - Password: - - - False - False - 0 - - - - - True - True - False - True - - - 1 - - - - - False - False - 2 - - - - - 1 - - - - - False - False - 1 - - - - - True - end - - - gtk-cancel - True - True - True - False - True - - - False - False - 0 - - - - - gtk-ok - True - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - cancelbutton1 - okbutton1 - - - - False - True - center - - - True - 12 - 12 - - - True - 0 - 0 - - - 0 - - - - - True - 12 - - - True - Connecting with Internet Service Provider - True - - - - - - - False - False - 0 - - - - - True - 0.10000000149 - - - False - False - 1 - - - - - 1 - - - - - - diff --git a/modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in b/modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in deleted file mode 100644 index 1866fab5..00000000 --- a/modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Applet Factory] -Id=ModemAppletFactory -Location=@LIBEXECDIR@/modem_applet -Name=Modem Factory -Description=Modem Applet Factory - -[ModemLightsApplet] -_Name=Modem Monitor -_Description=Activate and monitor a dial-up network connection -Icon=mate-modem-monitor-applet -MateComponentId=OAFIID:MATE_ModemLightsApplet -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-applets -X-MATE-Bugzilla-Component=modemlights -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=modem_applet diff --git a/modemlights/org.mate.panel.applet.ModemAppletFactory.service.in b/modemlights/org.mate.panel.applet.ModemAppletFactory.service.in deleted file mode 100644 index 01c34fe2..00000000 --- a/modemlights/org.mate.panel.applet.ModemAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.ModemAppletFactory -Exec=@LIBEXECDIR@/modem_applet diff --git a/po/POTFILES.in b/po/POTFILES.in index 753148cb..c6f4d41c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -53,9 +53,6 @@ invest-applet/invest/preferences.py invest-applet/invest/quotes.py invest-applet/invest/widgets.py # NB. these are actually separate files -modemlights/modem-applet.c -[type: gettext/glade]modemlights/modemlights.ui -[type: gettext/ini]modemlights/org.mate.applets.ModemApplet.mate-panel-applet.in.in multiload/linux-proc.c multiload/load-graph.c multiload/main.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 3de97993..c195953f 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -14,7 +14,6 @@ mateweather/Locations.xml.in 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 -modemlights/org.mate.applets.ModemApplet.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 -- cgit v1.2.1