OSDN Git Service

Ver. 0.4 Released --- Merge branch 'develop' master
authoryocto <yocto@users.sourceforge.jp>
Fri, 9 Sep 2011 13:15:19 +0000 (22:15 +0900)
committeryocto <yocto@users.sourceforge.jp>
Fri, 9 Sep 2011 13:15:19 +0000 (22:15 +0900)
 * Support TOMOYO Linux 2.4
 * The version of ccstools used was changed from 1.8.1 to 1.8.2p4.
 * Support policy namespace.
 * Desktop shortcut sample [gpet.desktop] added

1  2 
INSTALL
po/ja.po
src/gpet.c

diff --cc INSTALL
+++ b/INSTALL
@@@ -1,4 -1,4 +1,4 @@@
- gpet 0.3                                                2011-06-18
 -gpet 0.4                                                2011-09-10
++gpet 0.4                                                2011-09-09
  
  gpet (Gui Policy Editor for TOMOYO Linux)
      Build / Install / Run / Uninstall
diff --cc po/ja.po
+++ b/po/ja.po
@@@ -8,8 -8,8 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 0.1\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2011-06-10 13:56+0900\n"
- "PO-Revision-Date: 2011-06-10 13:56+0900\n"
 -"POT-Creation-Date: 2011-09-09 20:43+0900\n"
++"POT-Creation-Date: 2011-09-09 21:50+0900\n"
+ "PO-Revision-Date: 2011-09-09 20:43+0900\n"
  "Last-Translator: Yoshihiro Kusuno <yocto@users.sourceforge.jp>\n"
  "Language-Team: Japanese < >\n"
  "Language: \n"
diff --cc src/gpet.c
@@@ -308,7 -315,8 +315,8 @@@ enum list_column_pos 
        N_COLUMNS_LIST
  };
  
- void add_list_data(generic_list_t *generic, gboolean alias_flag)
 -void add_list_data(generic_list_t *generic, 
++void add_list_data(generic_list_t *generic,
+                       enum ccs_screen_type current_page)
  {
        GtkListStore    *store;
        GtkTreeIter     iter;
@@@ -725,12 -723,27 +723,27 @@@ static void cb_initialize_domain(GtkTre
  
        DEBUG_PRINT("In  **************************** \n");
        model = gtk_tree_view_get_model(treeview);
-       ret = gtk_tree_model_get_iter(model, &iter, treepath);
-       if (ret)
-               gtk_tree_model_get(model, &iter,
+       if (!gtk_tree_model_get_iter(model, &iter, treepath))
+               return;
+       gtk_tree_model_get(model, &iter, COLUMN_INDEX, &index,
                                COLUMN_REDIRECT, &data.redirect_index, -1);
-       DEBUG_PRINT("redirect_index[%d]\n", data.redirect_index);
-       if (!ret || data.redirect_index < 0)
+ //#undef DEBUG_PRINT
+ //#define DEBUG_PRINT g_print
+       DEBUG_PRINT("index[%d] redirect_index[%d]\n", index, data.redirect_index);
+       if (data.redirect_index == -2) {
 -              gchar *namespace = 
++              gchar *namespace =
+                       g_strdup(transition->dp->list[index].target->name);
+               DEBUG_PRINT("%s\n", namespace);
+               char *cp = strchr(namespace, ' ');
+               if (cp)
+                       *cp = '\0';
+               set_ns_tab_label(transition, namespace);
+               g_free(namespace);
+               refresh_transition(NULL, transition);
+               return;
+       } else if (data.redirect_index < 0)
                return;         /* not initialize_domain */
  
        data.path = NULL;