r16392 - in /desktop/unstable/gnome-applets/debian: changelog patches/09_modemlights_use_new_gst.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Jun 30 11:46:31 UTC 2008
Author: slomo
Date: Mon Jun 30 11:46:31 2008
New Revision: 16392
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16392
Log:
* debian/patches/09_modemlights_use_new_gst.patch:
+ Updated from the Ubuntu package for the new liboobs.
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=16392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog (original)
+++ desktop/unstable/gnome-applets/debian/changelog Mon Jun 30 11:46:31 2008
@@ -9,6 +9,8 @@
- Regenerated for the new version.
* debian/control.in:
+ Updated Standards-Version to 3.8.0, no additional changes needed.
+ * debian/patches/09_modemlights_use_new_gst.patch:
+ + Updated from the Ubuntu package for the new liboobs.
-- Sebastian Dröge <slomo at debian.org> Mon, 30 Jun 2008 12:50:57 +0200
Modified: desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch?rev=16392&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch Mon Jun 30 11:46:31 2008
@@ -1,7 +1,7 @@
-diff -Naur gnome-applets-2.22.0.old/configure.in gnome-applets-2.22.0/configure.in
---- gnome-applets-2.22.0.old/configure.in 2008-03-10 06:38:15.000000000 +0100
-+++ gnome-applets-2.22.0/configure.in 2008-03-17 20:55:09.000000000 +0100
-@@ -25,6 +25,7 @@
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/configure.in gnome-applets-2.21.1.new/configure.in
+--- gnome-applets-2.21.1/configure.in 2007-11-18 17:38:50.000000000 +0100
++++ gnome-applets-2.21.1.new/configure.in 2007-11-18 17:39:03.000000000 +0100
+@@ -24,6 +24,7 @@
LIBGAIL_REQUIRED=1.1.0
LIBXKLAVIER_REQUIRED=2.91
LIBWNCK_REQUIRED=2.9.3
@@ -9,7 +9,7 @@
SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
LIBGNOME_DESKTOP_REQUIRED=2.11.1
LIBNOTIFY_REQUIRED=0.3.2
-@@ -523,25 +524,21 @@
+@@ -509,25 +510,21 @@
dnl *** modemlights applet check ***
dnl ***************************************************************************
@@ -44,20 +44,23 @@
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
dnl ***************************************************************************
-diff -Naur gnome-applets-2.22.0.old/modemlights/Makefile.am gnome-applets-2.22.0/modemlights/Makefile.am
---- gnome-applets-2.22.0.old/modemlights/Makefile.am 2007-11-27 09:59:47.000000000 +0100
-+++ gnome-applets-2.22.0/modemlights/Makefile.am 2008-03-17 20:55:50.000000000 +0100
-@@ -2,6 +2,7 @@
-
- INCLUDES = -I. -I$(srcdir) \
- $(GNOME_APPLETS_CFLAGS) \
-+ $(MODEMLIGHTS_CFLAGS) \
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/Makefile.am gnome-applets-2.21.1.new/modemlights/Makefile.am
+--- gnome-applets-2.21.1/modemlights/Makefile.am 2007-07-28 04:03:06.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/Makefile.am 2007-11-18 17:39:03.000000000 +0100
+@@ -1,7 +1,8 @@
+ #SUBDIRS = docs
+
+-INCLUDES = -I. -I$(srcdir) \
+- $(GNOME_APPLETS_CFLAGS) \
++INCLUDES = -I. -I$(srcdir) \
++ $(GNOME_APPLETS_CFLAGS) \
++ $(MODEMLIGHTS_CFLAGS) \
$(LIBGLADE_CFLAGS)
libexec_PROGRAMS = modem_applet
-diff -Naur gnome-applets-2.22.0.old/modemlights/modem-applet.c gnome-applets-2.22.0/modemlights/modem-applet.c
---- gnome-applets-2.22.0.old/modemlights/modem-applet.c 2007-11-27 09:59:47.000000000 +0100
-+++ gnome-applets-2.22.0/modemlights/modem-applet.c 2008-03-17 21:31:08.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modem-applet.c gnome-applets-2.21.1.new/modemlights/modem-applet.c
+--- gnome-applets-2.21.1/modemlights/modem-applet.c 2007-10-13 11:41:35.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/modem-applet.c 2007-11-18 17:39:03.000000000 +0100
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
@@ -66,7 +69,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
-@@ -23,31 +23,14 @@
+@@ -23,31 +23,13 @@
#endif
#include <panel-applet.h>
@@ -80,7 +83,7 @@
-#include <libxml/tree.h>
+#include <oobs/oobs.h>
#include <glade/glade.h>
-
+-
-#ifdef __FreeBSD__
-#include <sys/ioctl.h>
-#include <termios.h>
@@ -99,7 +102,7 @@
typedef struct _ModemAppletPrivate ModemAppletPrivate;
struct _ModemAppletPrivate
-@@ -58,47 +41,19 @@
+@@ -58,47 +40,18 @@
GdkPixbuf *icon;
GtkWidget *image;
@@ -136,7 +139,6 @@
- gchar *dev; /* device name */
- gchar *lock_file; /* lock file */
+ /* configuration */
-+ OobsSession *session;
+ OobsObject *config;
+ OobsIface *iface;
+ gchar *lock_file;
@@ -154,7 +156,7 @@
};
static void modem_applet_class_init (ModemAppletClass *class);
-@@ -138,8 +93,6 @@
+@@ -138,8 +92,6 @@
gboolean backend_alive,
gboolean already_waiting);
@@ -163,7 +165,7 @@
static const BonoboUIVerb menu_verbs[] = {
BONOBO_UI_UNSAFE_VERB ("Activate", on_modem_applet_activate),
BONOBO_UI_UNSAFE_VERB ("Deactivate", on_modem_applet_deactivate),
-@@ -159,7 +112,6 @@
+@@ -159,7 +111,6 @@
object_class = G_OBJECT_CLASS (class);
applet_class = PANEL_APPLET_CLASS (class);
@@ -171,7 +173,7 @@
object_class->finalize = modem_applet_finalize;
applet_class->change_size = modem_applet_change_size;
-@@ -168,6 +120,56 @@
+@@ -168,6 +119,43 @@
g_type_class_add_private (object_class, sizeof (ModemAppletPrivate));
}
@@ -182,15 +184,8 @@
+ OobsListIter iter;
+ gboolean valid;
+
-+ /* First try the modem ifaces */
-+ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_MODEM);
-+ valid = oobs_list_get_iter_first (list, &iter);
-+
-+ if (valid)
-+ return (OobsIface *) oobs_list_get (list, &iter);
-+
-+ /* no modem? try the isdn ifaces */
-+ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_ISDN);
++ /* Try the PPP interfaces, which covers both modems and ISDN */
++ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_PPP);
+ valid = oobs_list_get_iter_first (list, &iter);
+
+ if (valid)
@@ -203,24 +198,18 @@
+get_lock_file (OobsIface *iface)
+{
+ gchar *lock_file;
++ const gchar *serial_port, *str;
+
+ if (!iface)
+ return NULL;
+
-+ if (OOBS_IS_IFACE_MODEM (iface))
++ serial_port = oobs_iface_ppp_get_serial_port (OOBS_IFACE_PPP (iface));
++
++ if (serial_port)
+ {
-+ const gchar *serial_port, *str;
-+
-+ serial_port = oobs_iface_modem_get_serial_port (OOBS_IFACE_MODEM (iface));
-+
-+ if (serial_port)
-+ {
-+ str = strchr (serial_port, '/');
-+ lock_file = g_strdup_printf ("/var/lock/LCK..%s", str + 1);
-+ }
++ str = strchr (serial_port, '/');
++ lock_file = g_strdup_printf ("/var/lock/LCK..%s", str + 1);
+ }
-+ else if (OOBS_IS_IFACE_ISDN (iface))
-+ lock_file = g_strdup ("/var/lock/LCK..capi_0");
+
+ return lock_file;
+}
@@ -228,24 +217,24 @@
static void
modem_applet_init (ModemApplet *applet)
{
-@@ -183,9 +185,10 @@
+@@ -183,9 +184,9 @@
priv->icon_theme = gtk_icon_theme_get_default ();
priv->image = gtk_image_new ();
- priv->auth_dialog = glade_xml_get_widget (priv->xml, "auth_dialog");
- priv->auth_dialog_label = glade_xml_get_widget (priv->xml, "auth_dialog_label");
- priv->auth_dialog_entry = glade_xml_get_widget (priv->xml, "auth_dialog_entry");
-+ priv->session = oobs_session_get ();
-+ priv->config = oobs_ifaces_config_get (priv->session);
++ priv->config = oobs_ifaces_config_get ();
+ priv->iface = get_modem_iface (OOBS_IFACES_CONFIG (priv->config));
+ priv->lock_file = get_lock_file (priv->iface);
priv->report_window = glade_xml_get_widget (priv->xml, "report_window");
priv->report_window_image = glade_xml_get_widget (priv->xml, "report_window_image");
-@@ -198,19 +201,8 @@
+@@ -197,20 +199,8 @@
+ pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
gdk_pixbuf_unref (pixbuf);
-
+-
- priv->configured = FALSE;
- priv->enabled = FALSE;
- priv->dev = NULL;
@@ -256,13 +245,14 @@
- priv->directives = NULL;
- priv->directives_id = g_timeout_add (250, (GSourceFunc) dispatch_directives, applet);
- priv->directive_running = FALSE;
++
priv->tooltip_id = g_timeout_add (1000, (GSourceFunc) update_tooltip, applet);
-
+-
- launch_backend (applet, FALSE);
gtk_container_add (GTK_CONTAINER (applet), priv->image);
}
-@@ -221,18 +213,24 @@
+@@ -221,18 +211,25 @@
if (priv)
{
@@ -281,6 +271,7 @@
+ g_source_remove (priv->pulse_id);
+ priv->pulse_id = 0;
+ }
++
+ if (priv->tooltip_id)
+ {
+ g_source_remove (priv->tooltip_id);
@@ -295,7 +286,7 @@
}
static void
-@@ -287,401 +285,27 @@
+@@ -287,401 +284,26 @@
}
}
@@ -628,7 +619,7 @@
- close (priv->write_fd);
-}
-
- /* functions for extracting the interface information from the XML */
+-/* functions for extracting the interface information from the XML */
static void
update_popup_buttons (ModemApplet *applet)
{
@@ -701,7 +692,7 @@
static gint
get_connection_time (const gchar *lock_file)
{
-@@ -700,196 +324,39 @@
+@@ -700,30 +322,30 @@
gchar *text;
gint t, t1, t2;
@@ -742,16 +733,17 @@
+ t2 = (t - (t1 * 3600 * 24)) / 3600; /* hours */
+ }
- text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2);
- }
+- text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2);
+- }
++ 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);
-
+@@ -731,165 +353,8 @@
return TRUE;
}
@@ -820,7 +812,7 @@
- update_popup_buttons (applet);
-}
-
--static gboolean
+ static gboolean
-update_info (ModemApplet *applet)
-{
- queue_directive (applet, update_info_callback,
@@ -912,13 +904,13 @@
- }
-}
-
- static gboolean
+-static gboolean
-launch_config_tool (GdkScreen *screen, gboolean is_isdn)
+launch_config_tool (GdkScreen *screen, OobsIface *iface)
{
gchar *argv[4], *application;
gboolean ret;
-@@ -900,8 +367,8 @@
+@@ -900,8 +365,8 @@
return FALSE;
argv[0] = application;
@@ -929,7 +921,7 @@
argv[3] = NULL;
ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0,
-@@ -910,52 +377,48 @@
+@@ -910,52 +375,48 @@
return ret;
}
@@ -1011,7 +1003,7 @@
}
static void
-@@ -963,7 +426,14 @@
+@@ -963,7 +424,14 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1027,7 +1019,7 @@
}
static void
-@@ -971,9 +441,15 @@
+@@ -971,7 +439,12 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1040,11 +1032,8 @@
+ oobs_object_commit_async (priv->config, on_config_committed, applet);
}
-+
static void
- on_modem_applet_properties_clicked (BonoboUIComponent *uic,
- ModemApplet *applet,
-@@ -985,7 +461,7 @@
+@@ -985,7 +458,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (applet));
@@ -1053,9 +1042,9 @@
{
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
-diff -Naur gnome-applets-2.22.0.old/modemlights/modemlights.glade gnome-applets-2.22.0/modemlights/modemlights.glade
---- gnome-applets-2.22.0.old/modemlights/modemlights.glade 2007-11-27 09:59:47.000000000 +0100
-+++ gnome-applets-2.22.0/modemlights/modemlights.glade 2008-03-17 21:31:32.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modemlights.glade gnome-applets-2.21.1.new/modemlights/modemlights.glade
+--- gnome-applets-2.21.1/modemlights/modemlights.glade 2007-07-28 04:03:06.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/modemlights.glade 2007-11-18 17:39:03.000000000 +0100
@@ -2,222 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
More information about the pkg-gnome-commits
mailing list