rpms/desktop-printing/FC-6 eggcups-api-name.patch, NONE, 1.1 desktop-printing.spec, 1.70, 1.71
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 8 18:27:10 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/desktop-printing/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14169
Modified Files:
desktop-printing.spec
Added Files:
eggcups-api-name.patch
Log Message:
* Wed Nov 8 2006 Tim Waugh <twaugh at redhat.com> - 0.19-17.0.1
- Fixed HAL printer interface API name (bug #214619).
- Resolves: rhbz#214619
eggcups-api-name.patch:
ec-cups-manager.c | 6 +++---
ec-driver-prompt-dialog.h | 8 ++++----
ec-tray-icon.c | 22 +++++++++++-----------
printdriverselector.conf | 14 +++++++-------
4 files changed, 25 insertions(+), 25 deletions(-)
--- NEW FILE eggcups-api-name.patch ---
--- eggcups-0.19/ec-tray-icon.c.api-name 2006-11-08 18:14:05.000000000 +0000
+++ eggcups-0.19/ec-tray-icon.c 2006-11-08 18:14:54.000000000 +0000
@@ -22,7 +22,7 @@
* Boston, MA 02111-1307, USA.
*/
-#define EC_OBJECT_PATH "/org/freedesktop/PrinterManager"
+#define EC_OBJECT_PATH "/com/redhat/PrinterManager"
#define EC_CONF_SESSION_CUPSD "/apps/eggcups/session_cupsd"
#include "ec-tray-icon.h"
@@ -549,15 +549,15 @@
GDK_THREADS_ENTER ();
if (dbus_message_is_signal (message,
- "org.freedesktop.PrinterSpooler",
+ "com.redhat.PrinterSpooler",
"JobQueuedLocal")) {
res = handle_dbus_local_queue (icon, is_session, message);
} else if (dbus_message_is_signal (message,
- "org.freedesktop.PrinterSpooler",
+ "com.redhat.PrinterSpooler",
"JobStartedLocal")) {
res = handle_dbus_local_start (icon, is_session, message);
} else if (dbus_message_is_signal (message,
- "org.freedesktop.PrinterSpooler",
+ "com.redhat.PrinterSpooler",
"JobQueuedRemote")) {
res = handle_dbus_remote_queue (icon, is_session, message);
} else if (dbus_message_is_signal (message,
@@ -678,7 +678,7 @@
rb_debug ("got message");
if (dbus_message_is_method_call (message,
- "org.freedesktop.PrinterManager",
+ "com.redhat.PrinterManager",
"promptPassword")) {
DBusError error;
DBusMessage *reply;
@@ -725,7 +725,7 @@
rb_debug ("got error return from gnome_password_dialog_run_and_block");
got_error = TRUE;
reply = dbus_message_new_error (message,
- "org.freedesktop.PrinterManager.noPasswordGiven",
+ "com.redhat.PrinterManager.noPasswordGiven",
"No password provided");
if (!reply) {
g_warning ("out of memory");
@@ -809,7 +809,7 @@
rb_debug ("acquired system bus");
dbus_bus_add_match (dbus,
"type='signal',"
- "interface='org.freedesktop.PrinterSpooler'",
+ "interface='com.redhat.PrinterSpooler'",
NULL);
dbus_connection_add_filter (dbus, handle_system_dbus_message, icon, leak);
if (icon->priv->driverprompt != NULL)
@@ -840,16 +840,16 @@
rb_debug ("acquired session bus");
- if (dbus_bus_request_name (dbus, "org.freedesktop.PrinterManager",
+ if (dbus_bus_request_name (dbus, "com.redhat.PrinterManager",
0, &error) < 0) {
- g_warning ("couldn't acquire service org.freedesktop.PrinterManager");
+ g_warning ("couldn't acquire service com.redhat.PrinterManager");
goto lose;
}
- rb_debug ("acquired org.freedesktop.PrinterManager");
+ rb_debug ("acquired com.redhat.PrinterManager");
dbus_bus_add_match (dbus,
"type='signal',"
- "interface='org.freedesktop.PrinterSpooler'",
+ "interface='com.redhat.PrinterSpooler'",
NULL);
dbus_connection_add_filter (dbus, handle_session_dbus_message, icon,
leak);
--- eggcups-0.19/ec-driver-prompt-dialog.h.api-name 2006-11-08 18:11:08.000000000 +0000
+++ eggcups-0.19/ec-driver-prompt-dialog.h 2006-11-08 18:11:32.000000000 +0000
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define EC_DRIVER_PROMPT_PATH "/org/freedesktop/PrintDriverSelection"
-#define EC_DRIVER_PROMPT_NAMESPACE "org.freedesktop.PrintDriverSelection"
+#define EC_DRIVER_PROMPT_PATH "/com/redhat/PrintDriverSelection"
+#define EC_DRIVER_PROMPT_NAMESPACE "com.redhat.PrintDriverSelection"
#define EC_DRIVER_FOOMATIC_PATH "/usr/bin/"
-#define CUPS_DRIVER_CONFIG_PATH "/org/freedesktop/CupsDriverConfig"
-#define CUPS_DRIVER_CONFIG_NAMESPACE "org.freedesktop.CupsDriverConfig"
+#define CUPS_DRIVER_CONFIG_PATH "/com/redhat/CupsDriverConfig"
+#define CUPS_DRIVER_CONFIG_NAMESPACE "com.redhat.CupsDriverConfig"
#define HAL_NAMESPACE "org.freedesktop.Hal"
#define HAL_PRINTER_INTERFACE "org.freedesktop.Hal.Device.Printer"
--- eggcups-0.19/printdriverselector.conf.api-name 2006-11-08 18:12:18.000000000 +0000
+++ eggcups-0.19/printdriverselector.conf 2006-11-08 18:13:22.000000000 +0000
@@ -3,22 +3,22 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<policy at_console="true">
- <allow own="org.freedesktop.PrintDriverSelection"/>
+ <allow own="com.redhat.PrintDriverSelection"/>
</policy>
<policy user="root">
- <allow own="org.freedesktop.PrintDriverSelection"/>
+ <allow own="com.freedredhat.PrintDriverSelection"/>
</policy>
<policy user="root">
- <allow send_destination="org.freedesktop.PrintDriverSelection"/>
- <allow send_interface="org.freedesktop.PrintDriverSelection"/>
+ <allow send_destination="com.redhat.PrintDriverSelection"/>
+ <allow send_interface="com.redhat.PrintDriverSelection"/>
</policy>
<policy context="default">
- <deny own="org.freedesktop.PrintDriverSelection"/>
+ <deny own="com.redhat.PrintDriverSelection"/>
- <deny send_destination="org.freedesktop.PrintDriverSelection"/>
- <deny send_interface="org.freedesktop.PrintDriverSelection"/>
+ <deny send_destination="com.redhat.PrintDriverSelection"/>
+ <deny send_interface="com.redhat.PrintDriverSelection"/>
</policy>
</busconfig>
--- eggcups-0.19/ec-cups-manager.c.api-name 2006-11-08 18:13:29.000000000 +0000
+++ eggcups-0.19/ec-cups-manager.c 2006-11-08 18:13:56.000000000 +0000
@@ -20,7 +20,7 @@
*
*/
-#define EC_SESSION_CUPS_OBJECT_PATH "/org/freedesktop/PrinterManager/SessionCups"
+#define EC_SESSION_CUPS_OBJECT_PATH "/com/redhat/PrinterManager/SessionCups"
#include "config.h"
#include "ec-cups-manager.h"
@@ -329,7 +329,7 @@
rb_debug ("got message");
if (dbus_message_is_method_call (message,
- "org.freedesktop.PrinterManager",
+ "com.redhat.PrinterManager",
"getPassword")) {
DBusMessage *reply;
char *password;
@@ -362,7 +362,7 @@
dbus_message_unref (reply);
return DBUS_HANDLER_RESULT_HANDLED;
} else if (dbus_message_is_method_call (message,
- "org.freedesktop.PrinterManager",
+ "com.redhat.PrinterManager",
"getPort")) {
DBusMessage *reply;
guint port;
Index: desktop-printing.spec
===================================================================
RCS file: /cvs/dist/rpms/desktop-printing/FC-6/desktop-printing.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- desktop-printing.spec 3 Nov 2006 12:47:43 -0000 1.70
+++ desktop-printing.spec 8 Nov 2006 18:27:08 -0000 1.71
@@ -6,7 +6,7 @@
Summary: Desktop print icon
Name: desktop-printing
Version: 0.19
-Release: 17%{?dist}
+Release: 17.0.1%{?dist}
License: GPL
Group: Applications/File
# total lie
@@ -20,6 +20,7 @@
Patch5: desktop-printing-0.19-transparent.patch
Patch6: desktop-printing-0.19-crash.patch
Patch7: eggcups-cups12.patch
+Patch8: eggcups-api-name.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Requires: redhat-menus
@@ -54,6 +55,7 @@
%patch5 -p2 -b .transparent
%patch6 -p2 -b .crash
%patch7 -p1 -b .cups12
+%patch8 -p1 -b .api-name
popd
%build
@@ -107,6 +109,9 @@
%{_sysconfdir}/gconf/*
%changelog
+* Wed Nov 8 2006 Tim Waugh <twaugh at redhat.com> - 0.19-17.0.1
+- Fixed HAL printer interface API name (bug #214619).
+
* Fri Nov 3 2006 Matthias Clasen <mclasen at redhat.com> - 0.19-17
- Fix a problem where eggcups loses track of remote jobs (#212763)
More information about the fedora-cvs-commits
mailing list