GNOME.org
 

[gnome-pilot/gtk3] Complete applet migration to gtk3. Add v3 versioning to conduit files.

commit cf4e96d3c9c0952d2d7a45c649e6ba67d6c82a48
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sun Mar 20 20:48:25 2011 +0000

    Complete applet migration to gtk3.  Add v3 versioning to conduit files.

 ChangeLog                                          |   23 ++++++++++++++++++++
 applet/Makefile.am                                 |    3 +-
 applet/pilot.c                                     |   23 +++++++-------------
 conduits/backup/backup.conduit.in                  |    2 +-
 .../evolution-data-server/e-address.conduit.in     |    2 +-
 .../evolution-data-server/e-calendar.conduit.in    |    2 +-
 conduits/evolution-data-server/e-memo.conduit.in   |    2 +-
 conduits/evolution-data-server/e-todo.conduit.in   |    2 +-
 conduits/file/file.conduit.in                      |    2 +-
 conduits/test/test.conduit.in                      |    2 +-
 10 files changed, 40 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 48261f3..61728a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,27 @@
 2011-03-13  Matt Davey <mcdavey mrao cam ac uk>
+       * gtk3 branch
+       * Fix #644319.  Avoid registering a "EPilot_Settings" multiple
+	   times from different Evolution conduits, by calling
+	   g_type_from_name() to see if it's already registered.
+       * applet/Makefile.am: allow installation of libpanel applet
+	   files in non-system location, to support "make distcheck"
+           Also, add missing substitution for libexecdir for .service
+	   file.
+       * applet/pilot.c: Fix .xml for applet menu.  Need to use "action"
+	   instead of "verb".  Also, remove unsupported pixmap stuff.
+       * conduits/evolution-data-server/e-address.conduit.in: add -3.0 to
+	   .so name.
+       * conduits/evolution-data-server/e-calendar.conduit.in: ditto
+       * conduits/evolution-data-server/e-memo.conduit.in: ditto
+       * conduits/evolution-data-server/e-todo.conduit.in: ditto
+       * conduits/conduits/file/file.conduit.in: ditto
+       * conduits/conduits/test/test.conduit.in: ditto
+
+
+
+
+
+2011-03-13  Matt Davey <mcdavey mrao cam ac uk>
        * gtk3 branch: merge changes from master
        * capplet/pilot.c: Avoid sending non-UTF8 pilot-encoded username
 	over DBUS.  Store username as UTF8 and convert at the last moment
diff --git a/applet/Makefile.am b/applet/Makefile.am
index 34a55b9..b12be46 100644
--- a/applet/Makefile.am
+++ b/applet/Makefile.am
@@ -50,7 +50,7 @@ pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = sync_paused.png sync_broken.png sync_icon.png syncing_icon.png
 
 # panel-applet file
-appletdir       = $(LIBPANEL_APPLET_DIR)
+appletdir       = $(datadir)$(LIBPANEL_APPLET_DIR_SUFFIX)
 applet_in_files = org.gnome.applets.PilotApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
@@ -69,6 +69,7 @@ service_DATA     = $(service_in_files:.service.in=.service)
 
 org.gnome.panel.applet.PilotAppletFactory.service: $(service_in_files)
 	$(AM_V_GEN)sed \
+	-e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
 	-e "s|\ LOCATION\@|$(APPLET_LOCATION)|" \
 	$< > $@
 
diff --git a/applet/pilot.c b/applet/pilot.c
index 8b09996..868f1d9 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -837,7 +837,7 @@ log_cb (GtkAction *action, gpointer user_data)
 
 static const GtkActionEntry pilot_applet_menu_actions [] = {
     { "Restore", NULL, N_("_Restore"), NULL, NULL, G_CALLBACK (restore_cb) },
-    { "State", GTK_STOCK_INFO, N_("_State"), NULL, NULL, G_CALLBACK (state_cb) },
+    { "State", GTK_STOCK_INFO, N_("_Pause/Resume"), NULL, NULL, G_CALLBACK (state_cb) },
     { "Restart", NULL, N_("R_estart"), NULL, NULL, G_CALLBACK (restart_cb) },
     { "Log", GTK_STOCK_INFO, N_("_Log"), NULL, NULL, G_CALLBACK (log_cb) },
     { "Props", GTK_STOCK_PROPERTIES, N_("_Props"), NULL, NULL, G_CALLBACK (properties_cb) },
@@ -857,21 +857,14 @@ install_popup_menu (PilotApplet *self, gboolean on_off)
            _("Preferences...") _("Help") _("About")
 #undef FOO_STRING
 	const char *menu_template = 
-		"<menuitem name=\"Restore\" verb=\"Restore\" _label=\"Restore...\""
-		"          pixtype=\"stock\" pixname=\"gtk-properties\"/>"
-		"<menuitem name=\"State\" verb=\"State\" _label=\"%s\""
-		"          pixtype=\"stock\" pixname=\"%s\"/>"
-		"<menuitem name=\"Restart\" verb=\"Restart\" _label=\"Restart\""
-		"          pixtype=\"stock\" pixname=\"gtk-execute\"/>"
-		"<menuitem name=\"Log\" verb=\"Log\" _label=\"Last log...\""
-		"          pixtype=\"stock\" pixname=\"gtk-new\"/>"
+		"<menuitem name=\"Restore\" action=\"Restore\" />"
+		"<menuitem name=\"Pause/Resume\" action=\"State\" />"
+		"<menuitem name=\"Restart\" action=\"Restart\" />"
+		"<menuitem name=\"Log\" action=\"Log\" />"
 		"<separator/>"
-		"<menuitem name=\"Props\" verb=\"Props\" _label=\"Preferences...\""
-		"          pixtype=\"stock\" pixname=\"gtk-properties\"/>"
-		"<menuitem name=\"Item 2\" verb=\"Help\" _label=\"Help\""
-		"          pixtype=\"stock\" pixname=\"gtk-help\"/>"
-		"<menuitem name=\"Item 3\" verb=\"About\" _label=\"About\""
-		"          pixtype=\"stock\" pixname=\"gnome-stock-about\"/>";
+		"<menuitem name=\"Props\" action=\"Props\" />"
+		"<menuitem name=\"Help\" action=\"Help\" />"
+		"<menuitem name=\"About\" action=\"About\" />";
 
 	if (on_off)
 		menu_xml = g_strdup_printf (menu_template, _("Continue"), "refresh");
diff --git a/conduits/backup/backup.conduit.in b/conduits/backup/backup.conduit.in
index f1a1d9c..d8fc314 100644
--- a/conduits/backup/backup.conduit.in
+++ b/conduits/backup/backup.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="gpbackup1" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libbackup_conduit.so"/>
+	<conduit id="gpbackup1" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libbackup_conduit-3.0.so"/>
 	<name value="Backup"/>
 	<conduit-attribute name="description" value="Backs up changed databases"/>
 	<conduit-attribute name="default-synctype" value="custom"/>
diff --git a/conduits/evolution-data-server/e-address.conduit.in b/conduits/evolution-data-server/e-address.conduit.in
index f455c56..6cbfd86 100644
--- a/conduits/evolution-data-server/e-address.conduit.in
+++ b/conduits/evolution-data-server/e-address.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_address_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libeaddress_conduit.so"/>
+	<conduit id="e_address_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libeaddress_conduit-3.0.so"/>
 	<name value="EAddress"/>
 	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-calendar.conduit.in b/conduits/evolution-data-server/e-calendar.conduit.in
index 4963257..52c26a8 100644
--- a/conduits/evolution-data-server/e-calendar.conduit.in
+++ b/conduits/evolution-data-server/e-calendar.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libecalendar_conduit.so"/>
+	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libecalendar_conduito-3.0.so"/>
 	<name value="ECalendar"/>
 	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-memo.conduit.in b/conduits/evolution-data-server/e-memo.conduit.in
index e0b8602..08fea34 100644
--- a/conduits/evolution-data-server/e-memo.conduit.in
+++ b/conduits/evolution-data-server/e-memo.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_memo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libememo_conduit.so"/>
+	<conduit id="e_memo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libememo_conduit-3.0.so"/>
 	<name value="EMemos"/>
 	<conduit-attribute name="description" value="Synchronizes Memo List with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-todo.conduit.in b/conduits/evolution-data-server/e-todo.conduit.in
index b07d10e..9e37924 100644
--- a/conduits/evolution-data-server/e-todo.conduit.in
+++ b/conduits/evolution-data-server/e-todo.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_todo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libetodo_conduit.so"/>
+	<conduit id="e_todo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libetodo_conduit-3.0.so"/>
 	<name value="EToDo"/>
 	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/file/file.conduit.in b/conduits/file/file.conduit.in
index 60135a4..09ad052 100644
--- a/conduits/file/file.conduit.in
+++ b/conduits/file/file.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="gpfile1" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libfile_conduit.so"/>
+	<conduit id="gpfile1" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libfile_conduit-3.0.so"/>
 	<name value="File"/>
 	<conduit-attribute name="description" value="Installs files on the PDA"/>
 	<conduit-attribute name="default-synctype" value="custom"/>
diff --git a/conduits/test/test.conduit.in b/conduits/test/test.conduit.in
index 6cbbce0..12da40d 100644
--- a/conduits/test/test.conduit.in
+++ b/conduits/test/test.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="test_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libtest_conduit.so"/>
+	<conduit id="test_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libtest_conduit-3.0.so"/>
 	<name value="Test"/>
 	<conduit-attribute name="description" value="Test conduit"/>
      	<conduit-attribute name="default-synctype" value="synchronize"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]