diff options
| author | Lillian Angel <langel@redhat.com> | 2006-06-08 20:27:54 +0000 |
|---|---|---|
| committer | Lillian Angel <langel@redhat.com> | 2006-06-08 20:27:54 +0000 |
| commit | 03e889390dd4a61c1bd981fd746018de47b5351b (patch) | |
| tree | e62a1b0644d967248596b10423dcd110741ed3d7 | |
| parent | 8f192b2dd13eaed478d34496dff2dbac9e458ee8 (diff) | |
| download | classpath-03e889390dd4a61c1bd981fd746018de47b5351b.tar.gz | |
2006-06-08 Lillian Angel <langel@redhat.com>
* native/plugin/Makefile.am:
Changed DATA_DIRECTORY to be ~/.gcjwebplugin.
* native/plugin/gcjwebplugin.cc:
Changed all instances of PLUGIN_DATA_DIRECTORY
to DATA_DIRECTORY.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | native/plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | native/plugin/gcjwebplugin.cc | 12 |
3 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2006-06-08 Lillian Angel <langel@redhat.com> + + * native/plugin/Makefile.am: + Changed DATA_DIRECTORY to be ~/.gcjwebplugin. + * native/plugin/gcjwebplugin.cc: + Changed all instances of PLUGIN_DATA_DIRECTORY + to DATA_DIRECTORY. + 2006-06-08 Roman Kennke <kennke@aicas.com> * java/awt/LightweightDispatcher.java diff --git a/native/plugin/Makefile.am b/native/plugin/Makefile.am index 19c7618d8..381be1407 100644 --- a/native/plugin/Makefile.am +++ b/native/plugin/Makefile.am @@ -4,7 +4,7 @@ libgcjwebplugin_la_SOURCES = gcjwebplugin.cc libgcjwebplugin_la_CXXFLAGS = \ -Wall -DAPPLETVIEWER_EXECUTABLE="\"$(bindir)/appletviewer\"" \ - -DPLUGIN_DATA_DIRECTORY="\"$(PLUGIN_DIR)/gcjwebplugin-data\"" \ + -DDATA_DIRECTORY="\"$(HOME)/.gcjwebplugin\"" \ $(MOZILLA_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) libgcjwebplugin_la_LDFLAGS = -avoid-version \ diff --git a/native/plugin/gcjwebplugin.cc b/native/plugin/gcjwebplugin.cc index deae81097..ac7471832 100644 --- a/native/plugin/gcjwebplugin.cc +++ b/native/plugin/gcjwebplugin.cc @@ -120,7 +120,7 @@ exception statement from your version. */ // Security dialog messages. #define RESPONSE_TRUST_APPLET "Trust Applet" #define RESPONSE_TRUST_APPLET_ADD_TO_LIST "Trust Applet and Add to Whitelist" -#define WHITELIST_FILENAME PLUGIN_DATA_DIRECTORY "/whitelist.txt" +#define WHITELIST_FILENAME DATA_DIRECTORY "/whitelist.txt" #define SECURITY_WARNING \ "%s wants to load an applet.\n" \ "GNU Classpath's security implementation is not complete.\n" \ @@ -326,7 +326,7 @@ GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode, // pipe. // data->in_pipe_name - data->in_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY + data->in_pipe_name = g_strdup_printf (DATA_DIRECTORY "/gcj-%s-appletviewer-to-plugin", data->instance_string); if (!data->in_pipe_name) @@ -349,7 +349,7 @@ GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode, // output pipe. // data->out_pipe_name - data->out_pipe_name = g_strdup_printf (PLUGIN_DATA_DIRECTORY + data->out_pipe_name = g_strdup_printf (DATA_DIRECTORY "/gcj-%s-plugin-to-appletviewer", data->instance_string); @@ -1608,16 +1608,16 @@ NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) // Make sure the plugin data directory exists, creating it if // necessary. - if (!g_file_test (PLUGIN_DATA_DIRECTORY, + if (!g_file_test (DATA_DIRECTORY, (GFileTest) (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { int file_error = 0; - file_error = g_mkdir (PLUGIN_DATA_DIRECTORY, 0700); + file_error = g_mkdir (DATA_DIRECTORY, 0700); if (file_error != 0) { PLUGIN_ERROR_TWO ("Failed to create data directory " - PLUGIN_DATA_DIRECTORY " ", + DATA_DIRECTORY " ", strerror (errno)); return NPERR_GENERIC_ERROR; } |