[Goodies-commits] r1798 - in verve-plugin/trunk: . panel-plugin scripts

[Jannis Pohlmann]

Author: jannis
Date: 2006-07-26 11:23:46 +0000 (Wed, 26 Jul 2006)
New Revision: 1798

Modified:
   verve-plugin/trunk/ChangeLog
   verve-plugin/trunk/panel-plugin/verve-dbus-service-infos.xml
   verve-plugin/trunk/panel-plugin/verve-dbus-service.c
   verve-plugin/trunk/panel-plugin/verve-history.c
   verve-plugin/trunk/scripts/verve-focus
Log:
	* panel-plugin/verve-dbus-service-infos.xml: Add the same 'OpenDialog'
	  method to the 'org.xfce.Verve' interface as we already support in
	  'org.xfce.RunDialog'.
	* scripts/verve-focus: Use 'OpenDialog' method of 'org.xfce.Verve'
	  interface to make sure we actually target a Verve instance and no
	  other 'org.xfce.RunDialog' providers.
	* panel-plugin/verve-dbus-service.c: Add
	  DBUS_NAME_FLAGS_ALLOW_REPLACEMENT to the 'org.xfce.Verve' name 
	  request. I bet users expect the last created Verve instance to have 
	  the ownership and to be focused when verve-focus is executed. Don't
	  do this for 'org.xfce.RunDialog' (until someone complains), because
	  I suppose a user using Verve doesn't want to use other RunDialog
	  providers.

Modified: verve-plugin/trunk/ChangeLog
===================================================================
--- verve-plugin/trunk/ChangeLog	2006-07-25 15:12:42 UTC (rev 1797)
+++ verve-plugin/trunk/ChangeLog	2006-07-26 11:23:46 UTC (rev 1798)
@@ -1,5 +1,21 @@
 2006-07-25	Jannis Pohlmann <jannis at xfce.org>
 
+	* panel-plugin/verve-dbus-service-infos.xml: Add the same 'OpenDialog'
+	  method to the 'org.xfce.Verve' interface as we already support in
+	  'org.xfce.RunDialog'.
+	* scripts/verve-focus: Use 'OpenDialog' method of 'org.xfce.Verve'
+	  interface to make sure we actually target a Verve instance and no
+	  other 'org.xfce.RunDialog' providers.
+	* panel-plugin/verve-dbus-service.c: Add
+	  DBUS_NAME_FLAGS_ALLOW_REPLACEMENT to the 'org.xfce.Verve' name 
+	  request. I bet users expect the last created Verve instance to have 
+	  the ownership and to be focused when verve-focus is executed. Don't
+	  do this for 'org.xfce.RunDialog' (until someone complains), because
+	  I suppose a user using Verve doesn't want to use other RunDialog
+	  providers.
+
+2006-07-25	Jannis Pohlmann <jannis at xfce.org>
+
 	* scripts/verve-focus: Call 'import pygtk; pygtk.require("2.0")' before
 	  importing the gtk module.
 	* panel-plugin/verve-plugin.c: Connect to "focus-out-event" of the input

Modified: verve-plugin/trunk/panel-plugin/verve-dbus-service-infos.xml
===================================================================
--- verve-plugin/trunk/panel-plugin/verve-dbus-service-infos.xml	2006-07-25 15:12:42 UTC (rev 1797)
+++ verve-plugin/trunk/panel-plugin/verve-dbus-service-infos.xml	2006-07-26 11:23:46 UTC (rev 1798)
@@ -40,6 +40,18 @@
     
   <interface name="org.xfce.Verve">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="verve_dbus_service" />
+
+    <!--
+      OpenDialog (dir : STRING, display : STRING) : VOID
+
+      dir     : either a file:-URI or an absolute path.
+      display : the screen on which to display the file properties
+                or "" to use the default screen of the current panel instance.
+    -->
+    <method name="OpenDialog">
+      <arg direction="in" name="dir" type="s" />
+      <arg direction="in" name="display" type="s" />
+    </method>
   </interface>
 </node>
 

Modified: verve-plugin/trunk/panel-plugin/verve-dbus-service.c
===================================================================
--- verve-plugin/trunk/panel-plugin/verve-dbus-service.c	2006-07-25 15:12:42 UTC (rev 1797)
+++ verve-plugin/trunk/panel-plugin/verve-dbus-service.c	2006-07-26 11:23:46 UTC (rev 1798)
@@ -136,7 +136,7 @@
     dbus_g_connection_register_g_object (dbus_service->connection, "/org/xfce/RunDialog", G_OBJECT (dbus_service));
 
     /* Request the org.xfce.Verve name for Verve */
-    dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.Verve", DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);
+    dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.Verve", DBUS_NAME_FLAG_REPLACE_EXISTING|DBUS_NAME_FLAG_ALLOW_REPLACEMENT, NULL);
 
     /* Request the org.xfce.RunDialog name for Verve */
     dbus_bus_request_name (dbus_g_connection_get_connection (dbus_service->connection), "org.xfce.RunDialog", DBUS_NAME_FLAG_REPLACE_EXISTING, NULL);

Modified: verve-plugin/trunk/panel-plugin/verve-history.c
===================================================================
--- verve-plugin/trunk/panel-plugin/verve-history.c	2006-07-25 15:12:42 UTC (rev 1797)
+++ verve-plugin/trunk/panel-plugin/verve-history.c	2006-07-26 11:23:46 UTC (rev 1798)
@@ -282,8 +282,6 @@
         /* Save the last 25 commands */
         for (i = 0; i < 25 && current != NULL; i++)
           {
-            g_print ("%d\n", i);
-
             /* Build output line */
             gchar *line = g_strconcat ("", current->data, "\n", NULL);
 

Modified: verve-plugin/trunk/scripts/verve-focus
===================================================================
--- verve-plugin/trunk/scripts/verve-focus	2006-07-25 15:12:42 UTC (rev 1797)
+++ verve-plugin/trunk/scripts/verve-focus	2006-07-26 11:23:46 UTC (rev 1798)
@@ -29,8 +29,8 @@
     # Connect to D-BUS
     bus = dbus.SessionBus()
 
-    # Try to get an org.xfce.RunDialog instance
-    remoteObject = bus.get_object("org.xfce.RunDialog", "/org/xfce/RunDialog")
+    # Try to get an org.xfce.Verve instance
+    remoteObject = bus.get_object("org.xfce.Verve", "/org/xfce/RunDialog")
 
     # Determine home directory
     if os.environ.has_key("HOME"):
@@ -47,4 +47,4 @@
 
     # Call OpenDialog method
     remoteObject.OpenDialog(homeDir, displayName, \
-            dbus_interface = "org.xfce.RunDialog")
+            dbus_interface = "org.xfce.Verve")