|
|
|
|
--- gnome-commander-1.2.8.15/src/dict.h.gcc47 2011-11-08 08:26:25.000000000 +0900
|
|
|
|
|
+++ gnome-commander-1.2.8.15/src/dict.h 2012-01-05 11:26:39.649243923 +0900
|
|
|
|
|
@@ -55,8 +55,8 @@
|
|
|
|
|
template <typename KEY, typename VAL>
|
|
|
|
|
inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
|
|
|
|
|
{
|
|
|
|
|
- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
|
|
|
|
|
- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
|
|
|
|
|
+ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL));
|
|
|
|
|
+ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL));
|
|
|
|
|
|
|
|
|
|
if (k_pos.second)
|
|
|
|
|
k_pos.first->second = &v_pos.first->first;
|
|
|
|
|
--- gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc.gcc47 2011-12-07 04:10:28.000000000 +0900
|
|
|
|
|
+++ gnome-commander-1.2.8.15/src/gnome-cmd-user-actions.cc 2013-01-20 03:36:16.000000000 +0900
|
|
|
|
|
@@ -1124,7 +1124,7 @@
|
|
|
|
|
|
|
|
|
|
without_c_param:
|
|
|
|
|
|
|
|
|
|
- char *argv[4];
|
|
|
|
|
+ const char *argv[4];
|
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
|
|
argv[i++] = su;
|
|
|
|
|
@@ -1135,7 +1135,7 @@
|
|
|
|
|
|
|
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
|
|
- if (!g_spawn_async (NULL, argv, NULL, GSpawnFlags (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, NULL, &error))
|
|
|
|
|
+ if (!g_spawn_async (NULL, (char **)argv, NULL, GSpawnFlags (G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, NULL, &error))
|
|
|
|
|
gnome_cmd_error_message (_("Unable to start GNOME Commander in root mode."), error);
|
|
|
|
|
|
|
|
|
|
g_free (su);
|
