diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-01-04 10:34:45 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-01-04 10:34:45 +0800 |
| commit | 8438c41a630620f3d8469a22af9cbb822772a935 (patch) | |
| tree | 3fd506b0be693e883dd3263bacbebfa681250c51 | |
| parent | 9842fcaea981db6a6f4692101079557953bc5914 (diff) | |
| download | gsoc2013-evolution-8438c41a630620f3d8469a22af9cbb822772a935.tar.gz gsoc2013-evolution-8438c41a630620f3d8469a22af9cbb822772a935.tar.zst gsoc2013-evolution-8438c41a630620f3d8469a22af9cbb822772a935.zip | |
Use EVOLUTION_PLUGINDIR as the macro name for the plugindir, to match what
2006-01-04 Tor Lillqvist <tml@novell.com>
* Makefile.am: Use EVOLUTION_PLUGINDIR as the macro name for the
plugindir, to match what is redefined for Win32 in
e-util/e-util-private.h
* publish-calendar.c (publish_calendar_locations)
* url-editor-dialog.c (url_editor_dialog_construct): Construct
glade file pathname at run-time.
svn path=/trunk/; revision=31044
| -rw-r--r-- | plugins/publish-calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | plugins/publish-calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 8 | ||||
| -rw-r--r-- | plugins/publish-calendar/url-editor-dialog.c | 8 |
4 files changed, 25 insertions, 3 deletions
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index e1799f5bcc..fee3911a5e 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,13 @@ +2006-01-04 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Use EVOLUTION_PLUGINDIR as the macro name for the + plugindir, to match what is redefined for Win32 in + e-util/e-util-private.h + + * publish-calendar.c (publish_calendar_locations) + * url-editor-dialog.c (url_editor_dialog_construct): Construct + glade file pathname at run-time. + 2005-12-25 Funda Wang <fundawang@linux.net.cn> * Makefile.am: Mark this plugin as translatable (bug#301149). diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 6453c9da60..7a40a7860d 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ $(EVOLUTION_CALENDAR_CFLAGS) \ - -DPLUGINDIR="\"$(plugindir)\"" + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" @EVO_PLUGIN_RULE@ diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 356e8934c4..8e2962da4c 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -30,6 +30,7 @@ #include <calendar/gui/e-cal-config.h> #include <calendar/gui/e-cal-menu.h> #include <shell/es-event.h> +#include <e-util/e-util-private.h> #include "url-editor-dialog.h" #include "publish-format-fb.h" #include "publish-format-ical.h" @@ -438,8 +439,13 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) GSList *l; GtkTreeIter iter; GConfClient *client; + char *gladefile; - xml = glade_xml_new (PLUGINDIR "/publish-calendar.glade", "toplevel", NULL); + gladefile = g_build_filename (EVOLUTION_PLUGINDIR, + "publish-calendar.glade", + NULL); + xml = glade_xml_new (gladefile, "toplevel", NULL); + g_free (gladefile); ui->treeview = glade_xml_get_widget (xml, "url list"); if (store == NULL) diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 63210d6743..b17ad26558 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -24,6 +24,7 @@ #include <libedataserverui/e-passwords.h> #include <libgnomevfs/gnome-vfs-utils.h> #include <string.h> +#include <e-util/e-util-private.h> static GtkDialogClass *parent_class = NULL; @@ -323,10 +324,15 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) GConfClient *gconf; GtkSizeGroup *group; EPublishUri *uri; + char *gladefile; gconf = gconf_client_get_default (); - gui = glade_xml_new (PLUGINDIR "/publish-calendar.glade", "publishing toplevel", NULL); + gladefile = g_build_filename (EVOLUTION_PLUGINDIR, + "publish-calendar.glade", + NULL); + gui = glade_xml_new (gladefile, "publishing toplevel", NULL); + g_free (gladefile); dialog->gui = gui; #define GW(name) ((dialog->name) = glade_xml_get_widget (dialog->gui, #name)) |