git gtk+/GNOME gui application: gitg

git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Hi,

I have been developing a gui application for git for gtk+/GNOME based on
GitX (which in turn is based on gitk). I feel that it's reaching the
point where it might potentially be useful for other people to use. It
currently features:

- Loading large repositories very fast
- Show/browse repository history
- Show highlighted revision diff
- Browse file tree of a revision and export by drag and drop
- Search in the revision history on subject, author or hash
- Switch between history view of branches easily
- Commit view providing per hunk stage/unstage and commit

The project is currently hosted on github:
http://github.com/jessevdk/gitg

clone: git://github.com/jessevdk/gitg.git

Please let me know what you think,


With kind regards,

-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[SZEDER Gábor]

Hi Jesse,

On Sat, Jan 31, 2009 at 09:05:17PM +0100, Jesse van den Kieboom wrote:
> I have been developing a gui application for git for gtk+/GNOME based on
> GitX (which in turn is based on gitk). I feel that it's reaching the
> point where it might potentially be useful for other people to use. It
> currently features:
> 
> - Loading large repositories very fast
> - Show/browse repository history
> - Show highlighted revision diff
> - Browse file tree of a revision and export by drag and drop
> - Search in the revision history on subject, author or hash
> - Switch between history view of branches easily
> - Commit view providing per hunk stage/unstage and commit
> 
> The project is currently hosted on github:
> http://github.com/jessevdk/gitg
> 
> clone: git://github.com/jessevdk/gitg.git
> 
> Please let me know what you think,

Great!

I wanted to give it a try, but didn't want to install it, and
experienced some problems.  The following two patches should improve
the situation a little bit, but it's still not a full-scale solution.

Regards,
Gábor

[PATCH 1/3] Fix "multi-character character constant" compile warning

[SZEDER Gábor]

From: SZEDER Gábor <szeder@fzi.de>

... that was caused by a short command line option.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 gitg/gitg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gitg/gitg.c b/gitg/gitg.c
index 1b33294..69c5b56 100644
--- a/gitg/gitg.c
+++ b/gitg/gitg.c
@@ -15,7 +15,7 @@ static gboolean commit_mode = FALSE;
 
 static GOptionEntry entries[] = 
 {
-	{ "commit", '-c', 0, G_OPTION_ARG_NONE, &commit_mode, N_("Start gitg in commit mode") }, 
+	{ "commit", 'c', 0, G_OPTION_ARG_NONE, &commit_mode, N_("Start gitg in commit mode") },
 	{ NULL }
 };
 
-- 
1.6.1.2.362.g0f78

[PATCH 2/3] Refactor loading xml UI files

[SZEDER Gábor]

For loading the xml UI files 'gitg-ui.xml' and 'gitg-menus.xml' the
same function call and error handling were performed twice.

This patch introduces a helper function to remove this code
duplication.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---

  Not sure about putting the new function into gitg-utils.c;  maybe it
  would be better in gitg.c...

 gitg/gitg-utils.c  |   16 ++++++++++++++++
 gitg/gitg-utils.h  |    2 ++
 gitg/gitg-window.c |   10 ++--------
 gitg/gitg.c        |    9 +--------
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/gitg/gitg-utils.c b/gitg/gitg-utils.c
index 5fb6772..cfce323 100644
--- a/gitg/gitg-utils.c
+++ b/gitg/gitg-utils.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 
@@ -417,3 +418,18 @@ gitg_utils_menu_position_under_tree_view (GtkMenu  *menu,
 							tree);
 	}
 }
+
+void
+gitg_builder_add_from_file(GtkBuilder *builder, const gchar *filename)
+{
+	GError *error = NULL;
+	gchar full_filename[PATH_MAX];
+
+	g_snprintf(full_filename, PATH_MAX, "%s%c%s", GITG_UI_DIR, G_DIR_SEPARATOR, filename);
+	if (!gtk_builder_add_from_file(builder, full_filename, &error))
+	{
+		g_critical("Could not open UI file: %s (%s)", full_filename, error->message);
+		g_error_free(error);
+		exit(1);
+	}
+}
diff --git a/gitg/gitg-utils.h b/gitg/gitg-utils.h
index 867fff7..46f8010 100644
--- a/gitg/gitg-utils.h
+++ b/gitg/gitg-utils.h
@@ -36,4 +36,6 @@ gint gitg_utils_sort_names(gchar const *s1, gchar const *s2);
 void gitg_utils_menu_position_under_widget(GtkMenu *menu, gint *x, gint *y,	gboolean *push_in, gpointer user_data);
 void gitg_utils_menu_position_under_tree_view(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer user_data);
 					   
+void gitg_builder_add_from_file(GtkBuilder *builder, const gchar *filename);
+
 #endif /* __GITG_UTILS_H__ */
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 8abdb9a..6f583d9 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -171,14 +171,8 @@ build_search_entry(GitgWindow *window, GtkBuilder *builder)
 	
 	GtkBuilder *b = gtk_builder_new();
 	gtk_builder_set_translation_domain(b, GETTEXT_PACKAGE);
-	GError *error = NULL;
 
-	if (!gtk_builder_add_from_file(b, GITG_UI_DIR "/gitg-menus.xml", &error))
-	{
-		g_critical("Could not open UI file: %s (%s)", GITG_UI_DIR "/gitg-menus.xml", error->message);
-		g_error_free(error);
-		exit(1);
-	}
+	gitg_builder_add_from_file(b, "gitg-menus.xml");
 	
 	GtkUIManager *manager = GTK_UI_MANAGER(gtk_builder_get_object(b, "uiman"));
 	window->priv->search_popup = GTK_WIDGET(g_object_ref(gtk_ui_manager_get_widget(manager, "/ui/search_popup")));
diff --git a/gitg/gitg.c b/gitg/gitg.c
index 69c5b56..20b9b53 100644
--- a/gitg/gitg.c
+++ b/gitg/gitg.c
@@ -52,17 +52,10 @@ on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer userdata)
 static GitgWindow *
 build_ui()
 {
-	GError *error = NULL;
-	
 	GtkBuilder *builder = gtk_builder_new();
 	gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
 	
-	if (!gtk_builder_add_from_file(builder, GITG_UI_DIR "/gitg-ui.xml", &error))
-	{
-		g_critical("Could not open UI file: %s (%s)", GITG_UI_DIR "/gitg-ui.xml", error->message);
-		g_error_free(error);
-		exit(1);
-	}
+	gitg_builder_add_from_file(builder, "gitg-ui.xml");
 	
 	GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
 	gtk_widget_show_all(window);
-- 
1.6.1.2.362.g0f78

[PATCH 3/3] Try load UI xml files from the current working directory

[SZEDER Gábor]

Currently, gitg looks for the UI xml files only at the paths where
they should have been installed.  This makes hard to just give gitg a
try without actually installing it, as it simply errors out.

This patch makes running gitg from the root directory of the working
tree possible by checking whether those UI files can be found under
the 'gitg' directory relative to the current working directory if they
can't be found on their proper place.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---

  This should be further enhanced (e.g. by looking for those files
  relative to the path of the gitg binary), because you can only browse
  gitg's history that way;  running gitg in an other git repository
  without installing it still doesn't work.

 gitg/gitg-utils.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gitg/gitg-utils.c b/gitg/gitg-utils.c
index cfce323..95bccd2 100644
--- a/gitg/gitg-utils.c
+++ b/gitg/gitg-utils.c
@@ -429,7 +429,12 @@ gitg_builder_add_from_file(GtkBuilder *builder, const gchar *filename)
 	if (!gtk_builder_add_from_file(builder, full_filename, &error))
 	{
 		g_critical("Could not open UI file: %s (%s)", full_filename, error->message);
-		g_error_free(error);
-		exit(1);
+
+		g_snprintf(full_filename, PATH_MAX, "%s%c%s", "gitg", G_DIR_SEPARATOR, filename);
+		if (!gtk_builder_add_from_file(builder, full_filename, &error))
+		{
+			g_error_free(error);
+			exit(1);
+		}
 	}
 }
-- 
1.6.1.2.362.g0f78

Re: git gtk+/GNOME gui application: gitg

[Michael J Gruber]

Jesse van den Kieboom venit, vidit, dixit 31.01.2009 21:05:
> Hi,
> 
> I have been developing a gui application for git for gtk+/GNOME based on
> GitX (which in turn is based on gitk). I feel that it's reaching the
> point where it might potentially be useful for other people to use. It
> currently features:
> 
> - Loading large repositories very fast
> - Show/browse repository history
> - Show highlighted revision diff
> - Browse file tree of a revision and export by drag and drop
> - Search in the revision history on subject, author or hash
> - Switch between history view of branches easily
> - Commit view providing per hunk stage/unstage and commit
> 
> The project is currently hosted on github:
> http://github.com/jessevdk/gitg
> 
> clone: git://github.com/jessevdk/gitg.git
> 
> Please let me know what you think,

Not yet another one, please!

I'm sorry, but that was my first thought. I lost count of how many
half-finished GUIs we have, using tcl/tk, gtk, qt, you-name-it-tk. I
still don't see any which provide a consistent, "modern", stable GUI for
viewing *and* committing, i.e. a replacement for gitk and git-gui.

The latter two still seem to be the most feature rich choices, but they
suffer somewhat from their implementation language. Just look at the git
survey and you know why nobody wants to work on them.

So, while any effort in enhancing the git environment is appreciated (I
do appreciate yours), we recently see an increased splitting of efforts
(web site, doc, lib, gui,...) rather than collaborative work. Maybe we
can create a "git-gui-ng community", or even two for gtk and qt if it
must be, but not more? A new "standard" gui which focusses most talents
and efforts?

Cheers,
Michael

The current tk high score list according to git.or.cz, including yours:

Qt3/4 : ******
GTK+  : ***
Tcl/Tk: **
Cocoa : **
MFC   : **
curses: *

Of the more modern tks, qt should be the most cross-platform solution.
Do we have a winner here?

Re: git gtk+/GNOME gui application: gitg

[Jakub Narebski]

Jesse van den Kieboom <jesse@icecrew.nl> writes:

> I have been developing a gui application for git for gtk+/GNOME based on
> GitX (which in turn is based on gitk). I feel that it's reaching the
> point where it might potentially be useful for other people to use.
[...]

How it differs from other git GUI applications for GTK+/GNOME,
namely GitView (in contrib/) and Giggle?

> The project is currently hosted on github:
> http://github.com/jessevdk/gitg

If you feel it is ready to be used (or at least tested), could you add
short information about this project in "Graphical Interfaces" section
of http://git.or.cz/gitwiki/InterfacesFrontendsAndTools (preferable
not using GUI edit, as it screws up formatting, unfortunately)?

TIA
-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: git gtk+/GNOME gui application: gitg

[Stefan Karpinski]

On Tue, Feb 3, 2009 at 8:58 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
>
> Not yet another one, please!
>
> I'm sorry, but that was my first thought. I lost count of how many
> half-finished GUIs we have, using tcl/tk, gtk, qt, you-name-it-tk. I
> still don't see any which provide a consistent, "modern", stable GUI for
> viewing *and* committing, i.e. a replacement for gitk and git-gui.
>
> The latter two still seem to be the most feature rich choices, but they
> suffer somewhat from their implementation language. Just look at the git
> survey and you know why nobody wants to work on them.

For what it's worth, GitX (OS X only) does both history viewing and
committing, and seems to be rapidly approaching the feature set of
gitk and git-gui combined. Unfortunately, I seem to inevitably hate
cross-platform GUI's---they never feel right or work slickly enough.
Sad, but true.

If GitX and this newer project could share a lot of code base, then
maybe their co-development would be accelerated and both would end up
being slick, native, full-fledged GUIs for git.

Re: git gtk+/GNOME gui application: gitg

[Miles Bader]

Michael J Gruber <git@drmicha.warpmail.net> writes:
> The current tk high score list according to git.or.cz, including yours:

"tk high score list"?

-Miles

-- 
"I distrust a research person who is always obviously busy on a task."
   --Robert Frosch, VP, GM Research

Re: git gtk+/GNOME gui application: gitg

[Felipe Contreras]

On Sat, Jan 31, 2009 at 10:05 PM, Jesse van den Kieboom
<jesse@icecrew.nl> wrote:
> Hi,
>
> I have been developing a gui application for git for gtk+/GNOME based on
> GitX (which in turn is based on gitk). I feel that it's reaching the
> point where it might potentially be useful for other people to use. It
> currently features:
>
> - Loading large repositories very fast
> - Show/browse repository history
> - Show highlighted revision diff
> - Browse file tree of a revision and export by drag and drop
> - Search in the revision history on subject, author or hash
> - Switch between history view of branches easily
> - Commit view providing per hunk stage/unstage and commit
>
> The project is currently hosted on github:
> http://github.com/jessevdk/gitg
>
> clone: git://github.com/jessevdk/gitg.git
>
> Please let me know what you think,

And the obligatory screenshots?

-- 
Felipe Contreras

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op woensdag 04-02-2009 om 09:39 uur [tijdzone +0200], schreef Felipe
Contreras:
> On Sat, Jan 31, 2009 at 10:05 PM, Jesse van den Kieboom
> <jesse@icecrew.nl> wrote:
> > Hi,
> >
> > I have been developing a gui application for git for gtk+/GNOME based on
> > GitX (which in turn is based on gitk). I feel that it's reaching the
> > point where it might potentially be useful for other people to use. It
> > currently features:
> >
> > - Loading large repositories very fast
> > - Show/browse repository history
> > - Show highlighted revision diff
> > - Browse file tree of a revision and export by drag and drop
> > - Search in the revision history on subject, author or hash
> > - Switch between history view of branches easily
> > - Commit view providing per hunk stage/unstage and commit
> >
> > The project is currently hosted on github:
> > http://github.com/jessevdk/gitg
> >
> > clone: git://github.com/jessevdk/gitg.git
> >
> > Please let me know what you think,
> 
> And the obligatory screenshots?

The screenshots are on the website


-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op dinsdag 03-02-2009 om 11:43 uur [tijdzone -0800], schreef Stefan
Karpinski:
> On Tue, Feb 3, 2009 at 8:58 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
> >
> > Not yet another one, please!
> >
> > I'm sorry, but that was my first thought. I lost count of how many
> > half-finished GUIs we have, using tcl/tk, gtk, qt, you-name-it-tk. I
> > still don't see any which provide a consistent, "modern", stable GUI for
> > viewing *and* committing, i.e. a replacement for gitk and git-gui.
> >
> > The latter two still seem to be the most feature rich choices, but they
> > suffer somewhat from their implementation language. Just look at the git
> > survey and you know why nobody wants to work on them.
> 
> For what it's worth, GitX (OS X only) does both history viewing and
> committing, and seems to be rapidly approaching the feature set of
> gitk and git-gui combined. Unfortunately, I seem to inevitably hate
> cross-platform GUI's---they never feel right or work slickly enough.
> Sad, but true.

This is the reason why I'm developing gitg as a separate application,
and not as a different front end for GitX.

> If GitX and this newer project could share a lot of code base, then
> maybe their co-development would be accelerated and both would end up
> being slick, native, full-fledged GUIs for git.

I try to follow the implementation of GitX very closely since it's the
basis of the development of gitg (it happens to be that I know the
developer of GitX very well).

-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: [PATCH 1/3] Fix "multi-character character constant" compile warning

[Jesse van den Kieboom]

Op dinsdag 03-02-2009 om 14:08 uur [tijdzone +0100], schreef SZEDER
Gábor:
> From: SZEDER Gábor <szeder@fzi.de>
> 
> ... that was caused by a short command line option.
> 
> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---
>  gitg/gitg.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/gitg/gitg.c b/gitg/gitg.c
> index 1b33294..69c5b56 100644
> --- a/gitg/gitg.c
> +++ b/gitg/gitg.c
> @@ -15,7 +15,7 @@ static gboolean commit_mode = FALSE;
>  
>  static GOptionEntry entries[] = 
>  {
> -	{ "commit", '-c', 0, G_OPTION_ARG_NONE, &commit_mode, N_("Start gitg in commit mode") }, 
> +	{ "commit", 'c', 0, G_OPTION_ARG_NONE, &commit_mode, N_("Start gitg in commit mode") },
>  	{ NULL }
>  };

This has already been fixed.


-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[Jakub Narebski]

Dnia środa 4. lutego 2009 13:01, Jesse van den Kieboom napisał:
> Op dinsdag 03-02-2009 om 09:00 uur [tijdzone -0800], schreef Jakub
> Narebski:
> > Jesse van den Kieboom <jesse@icecrew.nl> writes:
> > 
> > > I have been developing a gui application for git for gtk+/GNOME based on
> > > GitX (which in turn is based on gitk). I feel that it's reaching the
> > > point where it might potentially be useful for other people to use.
> > [...]

> > If you feel it is ready to be used (or at least tested), could you add
> > short information about this project in "Graphical Interfaces" section
> > of http://git.or.cz/gitwiki/InterfacesFrontendsAndTools (preferable
> > not using GUI edit, as it screws up formatting, unfortunately)?
> 
> Done.

Thanks a lot.

P.S. A reminder: as you would not do a commit without commit message,
please remember to enter 'comment' field when editing wiki.  TIA.
-- 
Jakub Narebski
Poland

Re: git gtk+/GNOME gui application: gitg

[Michael J Gruber]

Jesse van den Kieboom venit, vidit, dixit 04.02.2009 12:48:
> Op woensdag 04-02-2009 om 09:39 uur [tijdzone +0200], schreef Felipe
> Contreras:
>> On Sat, Jan 31, 2009 at 10:05 PM, Jesse van den Kieboom
>> <jesse@icecrew.nl> wrote:
>>> Hi,
>>>
>>> I have been developing a gui application for git for gtk+/GNOME based on
>>> GitX (which in turn is based on gitk). I feel that it's reaching the
>>> point where it might potentially be useful for other people to use. It
>>> currently features:
>>>
>>> - Loading large repositories very fast
>>> - Show/browse repository history
>>> - Show highlighted revision diff
>>> - Browse file tree of a revision and export by drag and drop
>>> - Search in the revision history on subject, author or hash
>>> - Switch between history view of branches easily
>>> - Commit view providing per hunk stage/unstage and commit
>>>
>>> The project is currently hosted on github:
>>> http://github.com/jessevdk/gitg
>>>
>>> clone: git://github.com/jessevdk/gitg.git
>>>
>>> Please let me know what you think,
>> And the obligatory screenshots?
> 
> The screenshots are on the website

Grin ;) At least I'm not the only one who didn't how to navigate the
github page...

In fact, reading the top line there in the first place would have made
me hopeful that this is a unifying rather than splitting project. So, my
best wishes (I'll try and compile)!

Cheers,
Michael

Re: git gtk+/GNOME gui application: gitg

[Felipe Contreras]

On Wed, Feb 4, 2009 at 2:46 PM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Jesse van den Kieboom venit, vidit, dixit 04.02.2009 12:48:
>> Op woensdag 04-02-2009 om 09:39 uur [tijdzone +0200], schreef Felipe
>> Contreras:
>>> On Sat, Jan 31, 2009 at 10:05 PM, Jesse van den Kieboom
>>> <jesse@icecrew.nl> wrote:
>>>> Hi,
>>>>
>>>> I have been developing a gui application for git for gtk+/GNOME based on
>>>> GitX (which in turn is based on gitk). I feel that it's reaching the
>>>> point where it might potentially be useful for other people to use. It
>>>> currently features:
>>>>
>>>> - Loading large repositories very fast
>>>> - Show/browse repository history
>>>> - Show highlighted revision diff
>>>> - Browse file tree of a revision and export by drag and drop
>>>> - Search in the revision history on subject, author or hash
>>>> - Switch between history view of branches easily
>>>> - Commit view providing per hunk stage/unstage and commit
>>>>
>>>> The project is currently hosted on github:
>>>> http://github.com/jessevdk/gitg
>>>>
>>>> clone: git://github.com/jessevdk/gitg.git
>>>>
>>>> Please let me know what you think,
>>> And the obligatory screenshots?
>>
>> The screenshots are on the website
>
> Grin ;) At least I'm not the only one who didn't how to navigate the
> github page...
>
> In fact, reading the top line there in the first place would have made
> me hopeful that this is a unifying rather than splitting project. So, my
> best wishes (I'll try and compile)!

I have several projects there, but I only use github for the vcs
stuff, I never actually clicked the 'wiki' tab before.

Anyway, I tried gitg and the history view looks very nice (like GitX),
definitely much better than Giggle, but unfortunately it's still not
usable for me (gitk addict). Keep up the good work :)

-- 
Felipe Contreras

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op woensdag 04-02-2009 om 16:12 uur [tijdzone +0200], schreef Felipe
Contreras:
> On Wed, Feb 4, 2009 at 2:46 PM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
> > Jesse van den Kieboom venit, vidit, dixit 04.02.2009 12:48:
> >> Op woensdag 04-02-2009 om 09:39 uur [tijdzone +0200], schreef Felipe
> >> Contreras:
> >>> On Sat, Jan 31, 2009 at 10:05 PM, Jesse van den Kieboom
> >>> <jesse@icecrew.nl> wrote:
> >>>> Hi,
> >>>>
> >>>> I have been developing a gui application for git for gtk+/GNOME based on
> >>>> GitX (which in turn is based on gitk). I feel that it's reaching the
> >>>> point where it might potentially be useful for other people to use. It
> >>>> currently features:
> >>>>
> >>>> - Loading large repositories very fast
> >>>> - Show/browse repository history
> >>>> - Show highlighted revision diff
> >>>> - Browse file tree of a revision and export by drag and drop
> >>>> - Search in the revision history on subject, author or hash
> >>>> - Switch between history view of branches easily
> >>>> - Commit view providing per hunk stage/unstage and commit
> >>>>
> >>>> The project is currently hosted on github:
> >>>> http://github.com/jessevdk/gitg
> >>>>
> >>>> clone: git://github.com/jessevdk/gitg.git
> >>>>
> >>>> Please let me know what you think,
> >>> And the obligatory screenshots?
> >>
> >> The screenshots are on the website
> >
> > Grin ;) At least I'm not the only one who didn't how to navigate the
> > github page...
> >
> > In fact, reading the top line there in the first place would have made
> > me hopeful that this is a unifying rather than splitting project. So, my
> > best wishes (I'll try and compile)!
> 
> I have several projects there, but I only use github for the vcs
> stuff, I never actually clicked the 'wiki' tab before.
> 
> Anyway, I tried gitg and the history view looks very nice (like GitX),
> definitely much better than Giggle, but unfortunately it's still not
> usable for me (gitk addict). Keep up the good work :)

Could you explain to me what makes it unusable for your wrt your
workflow in gitk?


-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[Michael J Gruber]

Jesse van den Kieboom venit, vidit, dixit 31.01.2009 21:05:
> Hi,
> 
> I have been developing a gui application for git for gtk+/GNOME based on
> GitX (which in turn is based on gitk). I feel that it's reaching the
> point where it might potentially be useful for other people to use. It
> currently features:
> 
> - Loading large repositories very fast
> - Show/browse repository history
> - Show highlighted revision diff
> - Browse file tree of a revision and export by drag and drop
> - Search in the revision history on subject, author or hash
> - Switch between history view of branches easily
> - Commit view providing per hunk stage/unstage and commit
> 
> The project is currently hosted on github:
> http://github.com/jessevdk/gitg
> 
> clone: git://github.com/jessevdk/gitg.git
> 
> Please let me know what you think,

OK, played with it, looks nice. Some feedback:

Bug:?
After unstaged a staged file it does not reappear under "unstaged". It
appears nowhere.

Build:
gitg can't run from the build dir, it needs to be installed.
Reconfiguring with different --prefix does not rebuild (one needs to
make clean manually).

Features:
Displaying the subject after the parent shas etc would be nice.
Maybe forward/back buttons for taking you forward/back in your *browsing
history*? Say, you click on a parent, and then you want to get back.
Can one stage hunks somehow?

Cheers,
Michael

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op woensdag 04-02-2009 om 15:29 uur [tijdzone +0100], schreef Michael J
Gruber:
> Jesse van den Kieboom venit, vidit, dixit 31.01.2009 21:05:
> > Hi,
> > 
> > I have been developing a gui application for git for gtk+/GNOME based on
> > GitX (which in turn is based on gitk). I feel that it's reaching the
> > point where it might potentially be useful for other people to use. It
> > currently features:
> > 
> > - Loading large repositories very fast
> > - Show/browse repository history
> > - Show highlighted revision diff
> > - Browse file tree of a revision and export by drag and drop
> > - Search in the revision history on subject, author or hash
> > - Switch between history view of branches easily
> > - Commit view providing per hunk stage/unstage and commit
> > 
> > The project is currently hosted on github:
> > http://github.com/jessevdk/gitg
> > 
> > clone: git://github.com/jessevdk/gitg.git
> > 
> > Please let me know what you think,
> 
> OK, played with it, looks nice. Some feedback:
> 
> Bug:?
> After unstaged a staged file it does not reappear under "unstaged". It
> appears nowhere.

Hmm this _should_ happen, if it doesn't it's certainly a bug.

> 
> Build:
> gitg can't run from the build dir, it needs to be installed.
> Reconfiguring with different --prefix does not rebuild (one needs to
> make clean manually).

This is true, I got a patch to fix this, but I'm not sure it should go
in (e.g. read data files from current working directory). It's not
common to be able to run C/gtk+ apps from the build directory, you
should install them in a local prefix.

> Features:
> Displaying the subject after the parent shas etc would be nice.
> Maybe forward/back buttons for taking you forward/back in your *browsing
> history*? Say, you click on a parent, and then you want to get back.

Showing the parent subject should be fairly easy to fix, I'll see if I
can get that in. I have thought about a history-history, but I haven't
felt the need to use it yet (also I don't think GitX has this), but it
might be worth implementing.

> Can one stage hunks somehow?

Yes, you can click on the hunk header @@...@@ when viewing the diff in
the commit view. You can also rightclick on this header and revert a
hunk (or stage/unstage it from the context menu).

> Cheers,
> Michael
> 
-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[Michael J Gruber]

Jesse van den Kieboom venit, vidit, dixit 04.02.2009 15:33:
> Op woensdag 04-02-2009 om 15:29 uur [tijdzone +0100], schreef Michael J
> Gruber:
>> Jesse van den Kieboom venit, vidit, dixit 31.01.2009 21:05:
>>> Hi,
>>>
>>> I have been developing a gui application for git for gtk+/GNOME based on
>>> GitX (which in turn is based on gitk). I feel that it's reaching the
>>> point where it might potentially be useful for other people to use. It
>>> currently features:
>>>
>>> - Loading large repositories very fast
>>> - Show/browse repository history
>>> - Show highlighted revision diff
>>> - Browse file tree of a revision and export by drag and drop
>>> - Search in the revision history on subject, author or hash
>>> - Switch between history view of branches easily
>>> - Commit view providing per hunk stage/unstage and commit
>>>
>>> The project is currently hosted on github:
>>> http://github.com/jessevdk/gitg
>>>
>>> clone: git://github.com/jessevdk/gitg.git
>>>
>>> Please let me know what you think,
>> OK, played with it, looks nice. Some feedback:
>>
>> Bug:?
>> After unstaged a staged file it does not reappear under "unstaged". It
>> appears nowhere.
> 
> Hmm this _should_ happen, if it doesn't it's certainly a bug.

I just compared with staging/reverting the single hunk I had in there,
that works perfectly. The bug occurs only when unstaging from the list
of staged files.

>> Build:
>> gitg can't run from the build dir, it needs to be installed.
>> Reconfiguring with different --prefix does not rebuild (one needs to
>> make clean manually).
> 
> This is true, I got a patch to fix this, but I'm not sure it should go
> in (e.g. read data files from current working directory). It's not
> common to be able to run C/gtk+ apps from the build directory, you
> should install them in a local prefix.

Sure, but just to try it out? Imagine me poor soul, going through all
these GUIs and cloning, running
autogen.sh/qmake-qt4/configure/make/setup.py depending on the tk, and
finding I have to install in order to try it out (not to mention
dependencies)? ;)

>> Can one stage hunks somehow?
> 
> Yes, you can click on the hunk header @@...@@ when viewing the diff in
> the commit view. You can also rightclick on this header and revert a
> hunk (or stage/unstage it from the context menu).

Uh, thanks, works like a charm. I had tried selecting and right-clicking
the hunk itself...

Cheers,
Michael

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op woensdag 04-02-2009 om 15:40 uur [tijdzone +0100], schreef Michael J
Gruber:
> Jesse van den Kieboom venit, vidit, dixit 04.02.2009 15:33:
> > Op woensdag 04-02-2009 om 15:29 uur [tijdzone +0100], schreef Michael J
> > Gruber:
> >> Jesse van den Kieboom venit, vidit, dixit 31.01.2009 21:05:
> >>> Hi,
> >>>
> >>> I have been developing a gui application for git for gtk+/GNOME based on
> >>> GitX (which in turn is based on gitk). I feel that it's reaching the
> >>> point where it might potentially be useful for other people to use. It
> >>> currently features:
> >>>
> >>> - Loading large repositories very fast
> >>> - Show/browse repository history
> >>> - Show highlighted revision diff
> >>> - Browse file tree of a revision and export by drag and drop
> >>> - Search in the revision history on subject, author or hash
> >>> - Switch between history view of branches easily
> >>> - Commit view providing per hunk stage/unstage and commit
> >>>
> >>> The project is currently hosted on github:
> >>> http://github.com/jessevdk/gitg
> >>>
> >>> clone: git://github.com/jessevdk/gitg.git
> >>>
> >>> Please let me know what you think,
> >> OK, played with it, looks nice. Some feedback:
> >>
> >> Bug:?
> >> After unstaged a staged file it does not reappear under "unstaged". It
> >> appears nowhere.
> > 
> > Hmm this _should_ happen, if it doesn't it's certainly a bug.
> 
> I just compared with staging/reverting the single hunk I had in there,
> that works perfectly. The bug occurs only when unstaging from the list
> of staged files.
> 
> >> Build:
> >> gitg can't run from the build dir, it needs to be installed.
> >> Reconfiguring with different --prefix does not rebuild (one needs to
> >> make clean manually).
> > 
> > This is true, I got a patch to fix this, but I'm not sure it should go
> > in (e.g. read data files from current working directory). It's not
> > common to be able to run C/gtk+ apps from the build directory, you
> > should install them in a local prefix.
> 
> Sure, but just to try it out? Imagine me poor soul, going through all
> these GUIs and cloning, running
> autogen.sh/qmake-qt4/configure/make/setup.py depending on the tk, and
> finding I have to install in order to try it out (not to mention
> dependencies)? ;)

Yeah I know, it's a hassle. But fixing this would involve quite some
hacks in the code (it's not just the ui xml files, also icons and other
installed data) to find this data. Unfortunately, autotools is not
really friendly in this way. It might be possible to build binaries
which have local resources (like OS X bundles) so it can be tried out
without installing, but I'm not sure it's worth the effort.

> >> Can one stage hunks somehow?
> > 
> > Yes, you can click on the hunk header @@...@@ when viewing the diff in
> > the commit view. You can also rightclick on this header and revert a
> > hunk (or stage/unstage it from the context menu).
> 
> Uh, thanks, works like a charm. I had tried selecting and right-clicking
> the hunk itself...
> 
> Cheers,
> Michael
> 
-- 
Jesse van den Kieboom

Personal: http://www.icecrew.nl
Professional: http://www.novowork.com

Re: git gtk+/GNOME gui application: gitg

[Felipe Contreras]

On Wed, Feb 4, 2009 at 4:18 PM, Jesse van den Kieboom <jesse@icecrew.nl> wrote:
> Could you explain to me what makes it unusable for your wrt your
> workflow in gitk?

First of all I always need to resize the window, and when I do that
the columns are not updated so I need to resize the columns as well.
Same thing with the division of the history and diff view.

Then when navigating I can't click the arrows, so I have to scroll
down until I see the parent of the commit.

There are many other issues, like crashes, small format annoyances and
the --all option, but those I bet are easy to fix, I could even do
that myself.

-- 
Felipe Contreras

Re: git gtk+/GNOME gui application: gitg

[Miles Bader]

I tried to clone using http (firewall), and it though it appears to
start working, I get an error eventually:

   $ git --version
   git version 1.6.0.6

   $ git clone http://github.com/jessevdk/gitg.git
   Initialized empty Git repository in /usr/local/src/gitg/.git/
   got b6905b4a594d43471dda682069912304d00d09eb
   walk b6905b4a594d43471dda682069912304d00d09eb
   got c559141e06684a257840ec25c492a559d762c6b4
   walk c559141e06684a257840ec25c492a559d762c6b4
   Getting alternates list for http://github.com/jessevdk/gitg.git
   got 8fdef672ca37fba292666a35ae63c7fdc9ceae05
   got becd09a6a05f55c3741f17dd60011f26ff0ad874
   got 1688b6f4c46dd6328ef4bd2d57001758d2cf87bc
   Getting pack list for http://github.com/jessevdk/gitg.git
   Getting index for pack 019562eeb660cc8f1998353b219a3000c647bba9
   Getting index for pack ca4b00556f8e389b94c726653bf57a23f70b5a0b
   Getting pack ca4b00556f8e389b94c726653bf57a23f70b5a0b
    which contains a9ac1b4d3ed7eae52bfbbaeed0a525c50e481b3f
   walk a9ac1b4d3ed7eae52bfbbaeed0a525c50e481b3f
   walk becd09a6a05f55c3741f17dd60011f26ff0ad874
   walk 09fa7f817482d655a17bf1c7215b8ec7b7d5e697
   walk b7d1d352bcb070a5e73f46bdc487e74c449e436d
   Getting pack 019562eeb660cc8f1998353b219a3000c647bba9
    which contains bc49446c1ab52217992bd73ade9bd9f6574d995f
   got b79e613eef67c570dff79c86d7155180fc0d1993
   got c6da20bc4c8d99d148affb8f4605cabfa08f0cf5
   got 9717983538ba087b26d32a3823e500c59b18ba93
   got e2f46af996c641dec74313fe3db2fef04678ca7a
   walk e2f46af996c641dec74313fe3db2fef04678ca7a
   got 8971bd20ee4c457a8ac32f26efa36b735ff954ba
   walk 0365be545a2156e77d9eec0804adec69b35db632
   walk 19d3917fe5fcb7ef25f2c76e53a9742354a12cc7
   got ce40340f97057dc50ea314fa2a6a25c1ae4b6053
   got fdca485305da4e49842004a793ed2c7e4e6ae765
   got b0ee0d42e9597f94adbb732b783de9b0b42f27f3
   got 94183c7e640174baf49c9e17ba59bddf98a8c8a1
   got 864fad05580300d4baa44aba2f472aebc63c38c0
   got 6d2b4734c562559f64581dd720dd6f7760a97124
   got d5d59822ef7dffb9eea1bff9a22b55f444734792
   got 1bd98d6397207409b2d00c8e1e1e7ec6066f9300
   got e700b08924147d61b9299130ee47ca5256bf6895
   got e359f0b9fc690b0d83a8e7e59b7069942f616cc4
   got cad64b422dc0a48a701d22ad586cc219a14a589d
   got 0756b0f050651f88fa541d154c6631bd298c3a99
   got be8cf3be5d2b499be2d7eadb9254c84709f885f3
   got 02ef6e9b53ede0495023862a460b952a7f0e41a8
   got 6d7a6159dd2797d8b01d49b615e1380f6bdc646c
   got 27b8f2d6c73b5c2eaf9b23c5ca0893957631fedb
   got 97d57428c4649edc653f9d50875acd8388ace724
   got 3f2cafcf18b14c75607eb7366be1ad10dd924962
   got 494b20433224100558e0625aebb2bb0f7168656f
   got 95f1f1e37f4e9ce33be2b29ff52bf670d2f27e15
   got 807f07450726a5aae13978c7b04ca5f4ae73a0b2
   got 7cf9ac5c258058017eca5ff91e6577cd31bed7d3
   got 867fff716512d15932980f703f2b3141fa1cfaca
   got 5fb67720ee8c962cbada9f572118ab12a3312249
   got 514777443f83cb6527042295444bf2e10e36e008
   got 032efecf0d387f8ee74c14dc88ab3d71491d55ed
   got 17e5cf02238de9c2636f6cf563a3a92ad75a077b
   got 31ed6bed0e57588c36349ee2ffb56fda45f9648b
   got 8b44321297cc6593cf93829b7b9ed322dbfc4a7b
   walk 8b44321297cc6593cf93829b7b9ed322dbfc4a7b
   got f74d7432fe2d86af12195b504ad45a2413a56cba
   got 48c31a1729ef64a96229eb5d259da51a60baf5ea
   walk 29e4a12594a6715db381757e820222ffc4f7c604
   walk 1b911a24f8f2cd0d52fa2cbec4a1dd9a9c5fc8b0
   got 56c41000b3762029629368794352d6aee91c7321
   got cae311b6c8277d6649ee692b2ef5a4863b854eb5
   got 9eeb2d6ef373540b1fbc1ad9239e5129ad445ad4
   error: Unable to find abd95fbc10fd6734ab17dde11ace646106def960 under http://github.com/jessevdk/gitg.git
   Cannot obtain needed blob abd95fbc10fd6734ab17dde11ace646106def960
   while processing commit 1b911a24f8f2cd0d52fa2cbec4a1dd9a9c5fc8b0.
   fatal: Fetch failed.

-miles

-- 
Electricity, n. The cause of all natural phenomena not known to be caused by
something else.

Re: git gtk+/GNOME gui application: gitg

[Jesse van den Kieboom]

Op 5 feb 2009, om 06:46 heeft Miles Bader het volgende geschreven:

> I tried to clone using http (firewall), and it though it appears to
> start working, I get an error eventually:
>

Cloning through http does not seem to work, I don't know why not,  
sorry...

>   $ git --version
>   git version 1.6.0.6
>
>   $ git clone http://github.com/jessevdk/gitg.git
>   Initialized empty Git repository in /usr/local/src/gitg/.git/
>   got b6905b4a594d43471dda682069912304d00d09eb
>   walk b6905b4a594d43471dda682069912304d00d09eb
>   got c559141e06684a257840ec25c492a559d762c6b4
>   walk c559141e06684a257840ec25c492a559d762c6b4
>   Getting alternates list for http://github.com/jessevdk/gitg.git
>   got 8fdef672ca37fba292666a35ae63c7fdc9ceae05
>   got becd09a6a05f55c3741f17dd60011f26ff0ad874
>   got 1688b6f4c46dd6328ef4bd2d57001758d2cf87bc
>   Getting pack list for http://github.com/jessevdk/gitg.git
>   Getting index for pack 019562eeb660cc8f1998353b219a3000c647bba9
>   Getting index for pack ca4b00556f8e389b94c726653bf57a23f70b5a0b
>   Getting pack ca4b00556f8e389b94c726653bf57a23f70b5a0b
>    which contains a9ac1b4d3ed7eae52bfbbaeed0a525c50e481b3f
>   walk a9ac1b4d3ed7eae52bfbbaeed0a525c50e481b3f
>   walk becd09a6a05f55c3741f17dd60011f26ff0ad874
>   walk 09fa7f817482d655a17bf1c7215b8ec7b7d5e697
>   walk b7d1d352bcb070a5e73f46bdc487e74c449e436d
>   Getting pack 019562eeb660cc8f1998353b219a3000c647bba9
>    which contains bc49446c1ab52217992bd73ade9bd9f6574d995f
>   got b79e613eef67c570dff79c86d7155180fc0d1993
>   got c6da20bc4c8d99d148affb8f4605cabfa08f0cf5
>   got 9717983538ba087b26d32a3823e500c59b18ba93
>   got e2f46af996c641dec74313fe3db2fef04678ca7a
>   walk e2f46af996c641dec74313fe3db2fef04678ca7a
>   got 8971bd20ee4c457a8ac32f26efa36b735ff954ba
>   walk 0365be545a2156e77d9eec0804adec69b35db632
>   walk 19d3917fe5fcb7ef25f2c76e53a9742354a12cc7
>   got ce40340f97057dc50ea314fa2a6a25c1ae4b6053
>   got fdca485305da4e49842004a793ed2c7e4e6ae765
>   got b0ee0d42e9597f94adbb732b783de9b0b42f27f3
>   got 94183c7e640174baf49c9e17ba59bddf98a8c8a1
>   got 864fad05580300d4baa44aba2f472aebc63c38c0
>   got 6d2b4734c562559f64581dd720dd6f7760a97124
>   got d5d59822ef7dffb9eea1bff9a22b55f444734792
>   got 1bd98d6397207409b2d00c8e1e1e7ec6066f9300
>   got e700b08924147d61b9299130ee47ca5256bf6895
>   got e359f0b9fc690b0d83a8e7e59b7069942f616cc4
>   got cad64b422dc0a48a701d22ad586cc219a14a589d
>   got 0756b0f050651f88fa541d154c6631bd298c3a99
>   got be8cf3be5d2b499be2d7eadb9254c84709f885f3
>   got 02ef6e9b53ede0495023862a460b952a7f0e41a8
>   got 6d7a6159dd2797d8b01d49b615e1380f6bdc646c
>   got 27b8f2d6c73b5c2eaf9b23c5ca0893957631fedb
>   got 97d57428c4649edc653f9d50875acd8388ace724
>   got 3f2cafcf18b14c75607eb7366be1ad10dd924962
>   got 494b20433224100558e0625aebb2bb0f7168656f
>   got 95f1f1e37f4e9ce33be2b29ff52bf670d2f27e15
>   got 807f07450726a5aae13978c7b04ca5f4ae73a0b2
>   got 7cf9ac5c258058017eca5ff91e6577cd31bed7d3
>   got 867fff716512d15932980f703f2b3141fa1cfaca
>   got 5fb67720ee8c962cbada9f572118ab12a3312249
>   got 514777443f83cb6527042295444bf2e10e36e008
>   got 032efecf0d387f8ee74c14dc88ab3d71491d55ed
>   got 17e5cf02238de9c2636f6cf563a3a92ad75a077b
>   got 31ed6bed0e57588c36349ee2ffb56fda45f9648b
>   got 8b44321297cc6593cf93829b7b9ed322dbfc4a7b
>   walk 8b44321297cc6593cf93829b7b9ed322dbfc4a7b
>   got f74d7432fe2d86af12195b504ad45a2413a56cba
>   got 48c31a1729ef64a96229eb5d259da51a60baf5ea
>   walk 29e4a12594a6715db381757e820222ffc4f7c604
>   walk 1b911a24f8f2cd0d52fa2cbec4a1dd9a9c5fc8b0
>   got 56c41000b3762029629368794352d6aee91c7321
>   got cae311b6c8277d6649ee692b2ef5a4863b854eb5
>   got 9eeb2d6ef373540b1fbc1ad9239e5129ad445ad4
>   error: Unable to find abd95fbc10fd6734ab17dde11ace646106def960  
> under http://github.com/jessevdk/gitg.git
>   Cannot obtain needed blob abd95fbc10fd6734ab17dde11ace646106def960
>   while processing commit 1b911a24f8f2cd0d52fa2cbec4a1dd9a9c5fc8b0.
>   fatal: Fetch failed.
>
> -miles
>
> -- 
> Electricity, n. The cause of all natural phenomena not known to be  
> caused by
> something else.
>

Re: git gtk+/GNOME gui application: gitg

[Miles Bader]

Jesse van den Kieboom <jesse@icecrew.nl> writes:
>> I tried to clone using http (firewall), and it though it appears to
>> start working, I get an error eventually:
>
> Cloning through http does not seem to work, I don't know why not,
> sorry...

It must be a github bug ... I guess I'll to find some bug address
there...

Thanks,

-Miles

-- 
Christian, n. One who follows the teachings of Christ so long as they are not
inconsistent with a life of sin.

Re: [PATCH 2/3] Refactor loading xml UI files

[Jesse van den Kieboom]

Op 3 feb 2009, om 14:08 heeft SZEDER Gábor het volgende geschreven:

> For loading the xml UI files 'gitg-ui.xml' and 'gitg-menus.xml' the
> same function call and error handling were performed twice.
>
> This patch introduces a helper function to remove this code
> duplication.
>

Thanks, I committed this (slightly altered)

> Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
> ---
>
>  Not sure about putting the new function into gitg-utils.c;  maybe it
>  would be better in gitg.c...
>
> gitg/gitg-utils.c  |   16 ++++++++++++++++
> gitg/gitg-utils.h  |    2 ++
> gitg/gitg-window.c |   10 ++--------
> gitg/gitg.c        |    9 +--------
> 4 files changed, 21 insertions(+), 16 deletions(-)
>
> diff --git a/gitg/gitg-utils.c b/gitg/gitg-utils.c
> index 5fb6772..cfce323 100644
> --- a/gitg/gitg-utils.c
> +++ b/gitg/gitg-utils.c
> @@ -1,3 +1,4 @@
> +#include <stdlib.h>
> #include <string.h>
> #include <glib.h>
>
> @@ -417,3 +418,18 @@ gitg_utils_menu_position_under_tree_view  
> (GtkMenu  *menu,
> 							tree);
> 	}
> }
> +
> +void
> +gitg_builder_add_from_file(GtkBuilder *builder, const gchar  
> *filename)
> +{
> +	GError *error = NULL;
> +	gchar full_filename[PATH_MAX];
> +
> +	g_snprintf(full_filename, PATH_MAX, "%s%c%s", GITG_UI_DIR,  
> G_DIR_SEPARATOR, filename);
> +	if (!gtk_builder_add_from_file(builder, full_filename, &error))
> +	{
> +		g_critical("Could not open UI file: %s (%s)", full_filename,  
> error->message);
> +		g_error_free(error);
> +		exit(1);
> +	}
> +}
> diff --git a/gitg/gitg-utils.h b/gitg/gitg-utils.h
> index 867fff7..46f8010 100644
> --- a/gitg/gitg-utils.h
> +++ b/gitg/gitg-utils.h
> @@ -36,4 +36,6 @@ gint gitg_utils_sort_names(gchar const *s1, gchar  
> const *s2);
> void gitg_utils_menu_position_under_widget(GtkMenu *menu, gint *x,  
> gint *y,	gboolean *push_in, gpointer user_data);
> void gitg_utils_menu_position_under_tree_view(GtkMenu *menu, gint  
> *x, gint *y, gboolean *push_in, gpointer user_data);
> 					
> +void gitg_builder_add_from_file(GtkBuilder *builder, const gchar  
> *filename);
> +
> #endif /* __GITG_UTILS_H__ */
> diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
> index 8abdb9a..6f583d9 100644
> --- a/gitg/gitg-window.c
> +++ b/gitg/gitg-window.c
> @@ -171,14 +171,8 @@ build_search_entry(GitgWindow *window,  
> GtkBuilder *builder)
> 	
> 	GtkBuilder *b = gtk_builder_new();
> 	gtk_builder_set_translation_domain(b, GETTEXT_PACKAGE);
> -	GError *error = NULL;
>
> -	if (!gtk_builder_add_from_file(b, GITG_UI_DIR "/gitg-menus.xml",  
> &error))
> -	{
> -		g_critical("Could not open UI file: %s (%s)", GITG_UI_DIR "/gitg- 
> menus.xml", error->message);
> -		g_error_free(error);
> -		exit(1);
> -	}
> +	gitg_builder_add_from_file(b, "gitg-menus.xml");
> 	
> 	GtkUIManager *manager = GTK_UI_MANAGER(gtk_builder_get_object(b,  
> "uiman"));
> 	window->priv->search_popup =  
> GTK_WIDGET(g_object_ref(gtk_ui_manager_get_widget(manager, "/ui/ 
> search_popup")));
> diff --git a/gitg/gitg.c b/gitg/gitg.c
> index 69c5b56..20b9b53 100644
> --- a/gitg/gitg.c
> +++ b/gitg/gitg.c
> @@ -52,17 +52,10 @@ on_window_delete_event(GtkWidget *widget,  
> GdkEvent *event, gpointer userdata)
> static GitgWindow *
> build_ui()
> {
> -	GError *error = NULL;
> -	
> 	GtkBuilder *builder = gtk_builder_new();
> 	gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
> 	
> -	if (!gtk_builder_add_from_file(builder, GITG_UI_DIR "/gitg- 
> ui.xml", &error))
> -	{
> -		g_critical("Could not open UI file: %s (%s)", GITG_UI_DIR "/gitg- 
> ui.xml", error->message);
> -		g_error_free(error);
> -		exit(1);
> -	}
> +	gitg_builder_add_from_file(builder, "gitg-ui.xml");
> 	
> 	GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,  
> "window"));
> 	gtk_widget_show_all(window);
> -- 
> 1.6.1.2.362.g0f78
>