DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Synchronized with the CVS plug-in

Browse Source
This commit is contained in:
Pierre Pronchery 2012-10-17 01:14:12 +00:00
parent 63951de1e8
commit 1d6b062761
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git.c
View File

@ -345,8 +345,12 @@ static void _refresh_make(Git * git, struct stat * st)
static void _refresh_status(Git * git, char const * status) static void _refresh_status(Git * git, char const * status)
{ {
if(status == NULL) if(status == NULL)
status = ""; gtk_widget_hide(git->status);
gtk_label_set_text(GTK_LABEL(git->status), status); else
{
gtk_label_set_text(GTK_LABEL(git->status), status);
gtk_widget_show(git->status);
}
} }
@ -432,8 +436,7 @@ static int _git_add_task(Git * git, char const * title,
#if GTK_CHECK_VERSION(2, 6, 0) #if GTK_CHECK_VERSION(2, 6, 0)
gtk_window_set_icon_name(GTK_WINDOW(task->window), plugin.icon); gtk_window_set_icon_name(GTK_WINDOW(task->window), plugin.icon);
#endif #endif
snprintf(buf, sizeof(buf), "%s - %s (%s)", _("Git"), title, snprintf(buf, sizeof(buf), "%s - %s (%s)", _("Git"), title, directory);
directory);
gtk_window_set_title(GTK_WINDOW(task->window), buf); gtk_window_set_title(GTK_WINDOW(task->window), buf);
g_signal_connect_swapped(task->window, "delete-event", G_CALLBACK( g_signal_connect_swapped(task->window, "delete-event", G_CALLBACK(
_git_task_on_closex), task); _git_task_on_closex), task);
@ -457,8 +460,8 @@ static int _git_add_task(Git * git, char const * title,
gtk_widget_show_all(task->window); gtk_widget_show_all(task->window);
pango_font_description_free(font); pango_font_description_free(font);
/* events */ /* events */
task->source = g_child_watch_add(task->pid, task->source = g_child_watch_add(task->pid, _git_task_on_child_watch,
_git_task_on_child_watch, task); task);
task->o_channel = g_io_channel_unix_new(task->o_fd); task->o_channel = g_io_channel_unix_new(task->o_fd);
if((g_io_channel_set_encoding(task->o_channel, NULL, &error)) if((g_io_channel_set_encoding(task->o_channel, NULL, &error))
!= G_IO_STATUS_NORMAL) != G_IO_STATUS_NORMAL)
@ -731,8 +734,7 @@ static gboolean _git_task_on_closex(gpointer data)
/* git_task_on_child_watch */ /* git_task_on_child_watch */
static void _git_task_on_child_watch(GPid pid, gint status, static void _git_task_on_child_watch(GPid pid, gint status, gpointer data)
gpointer data)
{ {
GitTask * task = data; GitTask * task = data;
char buf[256]; char buf[256];