[gitg] Be safe against the submodule url being null



commit c086d964660b25620caf0871c618e93c742e6fa2
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Aug 5 17:19:45 2015 +0200

    Be safe against the submodule url being null

 gitg/commit/gitg-commit-submodule-info.vala |    5 +++--
 libgitg/gitg-repository-list-box.vala       |   10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gitg/commit/gitg-commit-submodule-info.vala b/gitg/commit/gitg-commit-submodule-info.vala
index c9e6023..27d68e8 100644
--- a/gitg/commit/gitg-commit-submodule-info.vala
+++ b/gitg/commit/gitg-commit-submodule-info.vala
@@ -77,7 +77,8 @@ class SubmoduleInfo : Gtk.Grid
                        if (value != null)
                        {
                                d_label_path.set_text(value.get_path());
-                               d_label_url.set_text(value.get_url());
+                               var submodule_url = value.get_url();
+                               d_label_url.set_text(submodule_url != null ? submodule_url : "");
 
                                var oid = value.get_workdir_id();
                                d_label_sha1.set_text(oid.to_string());
@@ -94,4 +95,4 @@ class SubmoduleInfo : Gtk.Grid
        }
 }
 
-}
\ No newline at end of file
+}
diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
index f530ae4..4b985f1 100644
--- a/libgitg/gitg-repository-list-box.vala
+++ b/libgitg/gitg-repository-list-box.vala
@@ -193,8 +193,14 @@ namespace Gitg
 
                        public void add_submodule(Ggit.Submodule module)
                        {
+                               var submodule_url = module.get_url();
+                               if (submodule_url == null)
+                               {
+                                       return;
+                               }
+
                                var box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
-                               var tip = @"$(module.get_path())/ ($(module.get_url()))";
+                               var tip = @"$(module.get_path())/ ($(submodule_url))";
 
                                box.set_tooltip_text(tip);
                                box.show();
@@ -203,7 +209,7 @@ namespace Gitg
                                                                        Gtk.IconSize.MENU);
                                icon.show();
 
-                               var name = Path.get_basename(module.get_url());
+                               var name = Path.get_basename(submodule_url);
 
                                if (name.has_suffix(".git"))
                                {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]