Fixed a crash that occurs on Centos 6 due to a compiler bug.

[moonshot-ui.git] / src / moonshot-utils.vala

diff --git a/src/moonshot-utils.vala b/src/moonshot-utils.vala
index 7846745..a0a57aa 100644 (file)
--- a/src/moonshot-utils.vala
+++ b/src/moonshot-utils.vala
@@ -53,7 +53,17 @@ public bool gtk_available = false;
 
 public Gdk.Pixbuf? get_pixbuf(IdCard id)
 {
-    return find_icon("avatar-default", 48);
+    // NOTE: This is Centos 6 - specific. For other OSs, use:
+    // return find_icon("avatar-default", 48);
+
+    return null;
+
+// This might work on Centos 6 if we use the "gnome" theme instead of "default"
+//    Gdk.Pixbuf? pixbuf = find_icon("stock-person", 48);
+//    if (pixbuf != null) {
+//       return pixbuf;
+//    }
+//    return find_icon("stock-person", 32);
 }
 
 public Gdk.Pixbuf? find_icon(string name, int size)
@@ -85,6 +95,8 @@ public Gdk.Pixbuf? find_icon(string name, int size)
     }
 }
 
+
+
 public extern unowned string GetUserName();
 public extern unowned string GetFlatStoreUsersFilePath();
 
@@ -124,32 +136,32 @@ internal void set_atk_relation(Widget widget, Widget target_widget, Atk.Relation
 }
 
 
-internal Widget make_ta_fingerprint_widget(string server_cert)
+internal Widget make_ta_fingerprint_widget(string server_cert, string? label_text = null)
 {
-        var fingerprint_label = new Label(_("SHA-256 fingerprint:"));
-        fingerprint_label.set_alignment(0, 0.5f);
-
-        var fingerprint = new TextView();
-        var fontdesc = FontDescription.from_string("monospace 10");
-        fingerprint.modify_font(fontdesc);
-        fingerprint.set_editable(false);
-        fingerprint.set_left_margin(3);
-        var buffer = fingerprint.get_buffer();
-        buffer.set_text(colonize(server_cert, 16), -1);
-        fingerprint.wrap_mode = Gtk.WrapMode.WORD_CHAR;
-
-        set_atk_relation(fingerprint_label, fingerprint, Atk.RelationType.LABEL_FOR);
-
-        var fingerprint_width_constraint = new ScrolledWindow(null, null);
-        fingerprint_width_constraint.set_policy(PolicyType.NEVER, PolicyType.NEVER);
-        fingerprint_width_constraint.set_shadow_type(ShadowType.IN);
-        fingerprint_width_constraint.set_size_request(360, 60);
-        fingerprint_width_constraint.add_with_viewport(fingerprint);
-
-        var vbox = new VBox(false, 0);
-        vbox.pack_start(fingerprint_label, true, true, 2);
-        vbox.pack_start(fingerprint_width_constraint, true, true, 2);
-        return vbox;
+    var fingerprint_label = new Label(label_text ?? _("SHA-256 fingerprint:"));
+    fingerprint_label.set_alignment(0, 0.5f);
+
+    var fingerprint = new TextView();
+    var fontdesc = FontDescription.from_string("monospace 10");
+    fingerprint.modify_font(fontdesc);
+    fingerprint.set_editable(false);
+    fingerprint.set_left_margin(3);
+    var buffer = fingerprint.get_buffer();
+    buffer.set_text(colonize(server_cert, 16), -1);
+    fingerprint.wrap_mode = Gtk.WrapMode.WORD_CHAR;
+
+    set_atk_relation(fingerprint_label, fingerprint, Atk.RelationType.LABEL_FOR);
+
+    var fingerprint_width_constraint = new ScrolledWindow(null, null);
+    fingerprint_width_constraint.set_policy(PolicyType.NEVER, PolicyType.NEVER);
+    fingerprint_width_constraint.set_shadow_type(ShadowType.IN);
+    fingerprint_width_constraint.set_size_request(400, 60);
+    fingerprint_width_constraint.add_with_viewport(fingerprint);
+
+    var vbox = new VBox(false, 0);
+    vbox.pack_start(fingerprint_label, true, true, 2);
+    vbox.pack_start(fingerprint_width_constraint, true, true, 2);
+    return vbox;
 }
 
     // Yeah, it doesn't mean "colonize" the way you might think... :-)
@@ -174,6 +186,33 @@ internal static string colonize(string input, int bytes_per_line) {
     return result;
 }
 
+internal static void clear_password_entry(Entry entry) {
+    
+    // Overwrite the entry with random data
+    var len = entry.get_text().length;
+    var random_chars = new char[len + 1];
+    for (int i = 0; i < len; i++) {
+        random_chars[i] = (char) Random.int_range(40, 127);
+    }
+    random_chars[len] = 0;
+    string r = (string) random_chars;
+    var buf = entry.get_buffer();
+#if VALA_0_12
+    // Not sure if this works in 12; it definitely doesn't work in 10.
+    buf.set_text(r.data);
+
+    // Now delete the data
+    buf.delete_text(0, len);
+#else
+    string[] a = new string[1];
+    a[0] = r;
+    buf.set_text(a);
+
+    // Now delete the data
+    buf.delete_text(0, (int) len);
+#endif
+}
+
 static Gdk.Color white;
 static void set_bg_color(Widget w)
 {