diff options
| author | Rodney Dawes <dobey@ximian.com> | 2003-12-02 06:14:43 +0800 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2003-12-02 06:14:43 +0800 |
| commit | 7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0 (patch) | |
| tree | 7bd84d8e6b28d1d4e0a4d4d7959aa2bd2dbdecae /shell/e-shell-startup-wizard.c | |
| parent | 9b6e4f3e85115055b3df938cb0bdf7876575c952 (diff) | |
| download | gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.gz gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.bz2 gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.lz gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.xz gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.tar.zst gsoc2013-evolution-7af66de0238f45979c19eaa3cc9a2e2ba1d9dea0.zip | |
Use BASE_VERSION for repo_ids and OAFIIDs Update killev to kill the
2003-12-01 Rodney Dawes <dobey@ximian.com>
* Use BASE_VERSION for repo_ids and OAFIIDs
* Update killev to kill the correct versions of gnome-spell and the
GtkHTML Editor
svn path=/trunk/; revision=23543
Diffstat (limited to 'shell/e-shell-startup-wizard.c')
| -rw-r--r-- | shell/e-shell-startup-wizard.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c index 63460cc68b..ac6d6a4770 100644 --- a/shell/e-shell-startup-wizard.c +++ b/shell/e-shell-startup-wizard.c @@ -142,10 +142,14 @@ start_wizard (void) Bonobo_ServerInfoList *info; CORBA_Environment ev; GNOME_Evolution_Wizard wizard; + char *query; int i; CORBA_exception_init (&ev); - info = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/StartupWizard:1.0')", selection_order, &ev); + query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/StartupWizard:%s')", BASE_VERSION); + info = bonobo_activation_query (query, selection_order, &ev); + g_free (query); + if (BONOBO_EX (&ev) || info == CORBA_OBJECT_NIL) { g_warning ("Cannot find startup wizard -- %s", BONOBO_EX_REPOID (&ev)); CORBA_exception_free (&ev); @@ -513,10 +517,13 @@ get_intelligent_importers (void) Bonobo_ServerInfoList *info_list; GList *iids_ret = NULL; CORBA_Environment ev; + char *query; int i; CORBA_exception_init (&ev); - info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:1.0')", NULL, &ev); + query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/IntelligentImporter:%s'", BASE_VERSION); + info_list = bonobo_activation_query (query, NULL, &ev); + g_free (query); CORBA_exception_free (&ev); for (i = 0; i < info_list->_length; i++) { |