• R/O
  • HTTP
  • SSH
  • HTTPS

origin: Commit

gpet(Gui Policy Editor for TOMOYO Linux) repository


Commit MetaInfo

Revision1999eecd513795f572c3f4866657612933d92983 (tree)
Zeit2011-09-23 01:30:55
Autoryocto <yocto@user...>
Commiteryocto

Log Message

Ver. 0.5 pre

Ändern Zusammenfassung

Diff

--- a/src/menu.c
+++ b/src/menu.c
@@ -1385,9 +1385,9 @@ GdkPixbuf *get_png_file(void)
13851385
13861386 static void show_about_dialog(void)
13871387 {
1388- GtkWidget *dialog;
1388+ GtkWidget *dialog;
13891389 GtkAboutDialog *about;
1390- GdkPixbuf *pixbuf;
1390+ GdkPixbuf *pixbuf;
13911391
13921392 const gchar *authors[] = {
13931393 _("Yoshihiro Kusuno <yocto@users.sourceforge.jp>"),
@@ -1406,11 +1406,11 @@ static void show_about_dialog(void)
14061406 gtk_about_dialog_set_copyright(about,
14071407 "Copyright(C) 2010,2011 TOMOYO Linux Project");
14081408 gtk_about_dialog_set_comments(about,
1409- "Gui Policy Editor for TOMOYO Linux 2.4 , 1.8.2"
1410- " or AKARI 1.0.17"
1411- "\n(based on ccs-editpolicy:ccstools)");
1409+ "Gui Policy Editor for TOMOYO Linux 2.4, 2.5 , 1.8.X"
1410+ " or AKARI 1.0.XX"
1411+ "\n(based on ccs-editpolicy:ccstools)");
14121412 gtk_about_dialog_set_website(about, "http://sourceforge.jp/projects/gpet/");
1413-// gtk_about_dialog_set_website_label(about, "http://tomoyo.sourceforge.jp/");
1413+// gtk_about_dialog_set_website(about, "http://gpet.sourceforge.jp/");
14141414
14151415 pixbuf = get_png_file();
14161416 if (pixbuf) {
--- a/src/other.c
+++ b/src/other.c
@@ -450,7 +450,7 @@ static void cb_toggled_conf_file(GtkToggleButton *widget, gboolean *conf_file)
450450 static gint warning_dialog(char *real_path, gboolean *conf_file)
451451 {
452452 GtkWidget *dialog;
453- GtkWidget *vbox;
453+ GtkWidget *vbox, *hbox;
454454 GtkWidget *label;
455455 GtkWidget *conf;
456456 gchar *markup, *str;
@@ -470,7 +470,7 @@ static gint warning_dialog(char *real_path, gboolean *conf_file)
470470 GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
471471
472472 label = gtk_label_new(message);
473- gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
473+ gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 5);
474474
475475 markup = g_markup_printf_escaped(
476476 _("<span foreground='red' size='x-large'>Not yet registered</span>\n\n"
@@ -479,17 +479,20 @@ static gint warning_dialog(char *real_path, gboolean *conf_file)
479479 gtk_label_set_markup(GTK_LABEL(label), markup);
480480 g_free(markup);
481481
482+ hbox = gtk_hbox_new(FALSE, 15);
483+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 20);
484+
482485 str = g_strdup_printf(_(" Add %s%s "),
483486 CCS_DISK_DIR, CCS_DISK_POLICY_MANAGER);
484487 conf = gtk_check_button_new_with_mnemonic(str);
485488 g_free(str);
486- gtk_box_pack_start(GTK_BOX(vbox), conf, FALSE, FALSE, 1);
489+ gtk_box_pack_end(GTK_BOX(hbox), conf, FALSE, TRUE, 5);
487490 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(conf), *conf_file);
488491 g_signal_connect(G_OBJECT(conf), "toggled",
489492 G_CALLBACK(cb_toggled_conf_file), conf_file);
490493
491494 gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
492-// gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_APPLY);
495+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_REJECT);
493496 gtk_widget_show_all(dialog);
494497 result = gtk_dialog_run(GTK_DIALOG(dialog));
495498 gtk_widget_destroy(dialog);
Show on old repository browser