[Frugalware-git] gfpm: gfpm: do not hide the progress bar when syncing. Instead, hide it only when actually download packages.

[Priyank]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm/.git;a=commitdiff;h=c9b8cfd17fdca0567df73a4cb432ce2a624ec511

commit c9b8cfd17fdca0567df73a4cb432ce2a624ec511
Author: Priyank <[EMAIL PROTECTED]>
Date:   Mon Aug 6 18:58:54 2007 +0530

gfpm: do not hide the progress bar when syncing. Instead, hide it only when 
actually download packages.

diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index e7dee83..51a3d2f 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -294,7 +294,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data)
return;
}

-               gfpm_progress_show (TRUE);
+               gfpm_progress_show (TRUE, 0);
GList *i = NULL;
PM_LIST *data, *pkgs;
for (i = (GList*)remove_list; i; i = i->next)
@@ -344,7 +344,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data)
return;
}

-               gfpm_progress_show (TRUE);
+               gfpm_progress_show (TRUE, 0);
GList *i = NULL;
PM_LIST *data, *pkgs;
for (i = (GList*)install_list; i; i = i->next)
@@ -374,7 +374,7 @@ cb_gfpm_apply_btn_clicked (GtkButton *button, gpointer data)
gfpm_package_list_free (GFPM_INSTALL_LIST);
gfpm_apply_dlg_reset ();
}
-       gfpm_progress_show (FALSE);
+       gfpm_progress_show (FALSE, 0);

if (current_group != NULL)
{
@@ -871,9 +871,9 @@ cb_gfpm_refresh_button_clicked (GtkButton *button, gpointer 
data)
"Do you want to continue upgrading pacman-g2 ?");

gfpm_progress_set_main_text (_("Synchronizing package databases"));
-       gfpm_progress_show (TRUE);
+       gfpm_progress_show (TRUE, 1);
ret = pacman_db_update (0, sync_db);
-       gfpm_progress_show (FALSE);
+       gfpm_progress_show (FALSE, 1);
/* check for a pacman-g2 update */
pm_lpkg = pacman_db_readpkg (local_db, "pacman-g2");
pm_spkg = pacman_db_readpkg (sync_db, "pacman-g2");
@@ -1274,7 +1274,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer 
data)
}
return;
}
-       gfpm_progress_show (TRUE);
+       gfpm_progress_show (TRUE, 0);
/* add the target */
pacman_trans_addtarget ((char*)fpm);
if (pacman_trans_prepare(&trans_data) == -1)
@@ -1348,7 +1348,7 @@ cb_gfpm_install_file_clicked (GtkButton *button, gpointer 
data)
g_string_free (errorstr, FALSE);
pacman_trans_release ();
gtk_widget_hide (gfpm_inst_from_file_dlg);
-       gfpm_progress_show (FALSE);
+       gfpm_progress_show (FALSE, 0);
return;
}

diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c
index 8188572..d897b5c 100644
--- a/src/gfpm-progress.c
+++ b/src/gfpm-progress.c
@@ -69,19 +69,25 @@ gfpm_progress_init (void)
}

void
-gfpm_progress_show (gboolean show)
+gfpm_progress_show (gboolean show, gint sync)
{
if (show == TRUE)
{
gtk_widget_show (progresswindow);
-               gfpm_systray_set_visible (TRUE);
-               gtk_widget_hide (gfpm_mw);
+               if (!sync)
+               {
+                       gtk_widget_hide (gfpm_mw);
+                       gfpm_systray_set_visible (TRUE);
+               }
}
else
{
gtk_widget_hide (progresswindow);
-               gfpm_systray_set_visible (FALSE);
-               gtk_widget_show (gfpm_mw);
+               if (!sync)
+               {
+                       gtk_widget_show (gfpm_mw);
+                       gfpm_systray_set_visible (FALSE);
+               }
}

return;
diff --git a/src/gfpm-progress.h b/src/gfpm-progress.h
index d4a4fee..ec587b7 100644
--- a/src/gfpm-progress.h
+++ b/src/gfpm-progress.h
@@ -20,7 +20,7 @@ int gfpm_progress_update (netbuf *, int, void *);

void gfpm_progress_install (unsigned char, char *, int, int, int);

-void gfpm_progress_show (gboolean);
+void gfpm_progress_show (gboolean, gint);

void gfpm_progress_set_main_text (const char *msg);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git