Dnia 20-09-2004, pon o godzinie 01:44 +0200, Paweł Sakowski napisał(a): > On Mon, 2004-09-20 at 01:41 +0200, Kamil 'paladine' Kosiński wrote: > > Group: X11/Applications/Networking > > lsof i networking?? Chyba nie ta grupa. Nie da się ukryć :)
> Lepiej byłoby chyba przepakować tego patcha do unified diff bo:
Zrobione
> > %{_datadir}/%{name}/xml_data_type_doc/*
>
> W ten sposób %{_datadir}/%{name} i xml_data_type_doc nie należy do
> żadnego pakietu. s,/xml.*,,
Racja. Nie zwróciłem na to uwagi. Poprawione.
Mam nadzieję, że teraz już wszystko ok.
--
|-------------- Kamil 'paladine' Kosiński -------------|
|------------------------------------------------------|
|---- mail: paladine @ palanthas . homelinux . org ----|
|----- JID: [EMAIL PROTECTED] ------ GG: 4232832 -----|
diff -urN glsof-0.9.16.oryg/src/autorefresh.c glsof-0.9.16/src/autorefresh.c
--- glsof-0.9.16.oryg/src/autorefresh.c 2004-09-20 02:08:15.865379848 +0200
+++ glsof-0.9.16/src/autorefresh.c 2004-09-20 02:09:20.962483584 +0200
@@ -5,6 +5,7 @@
#include "file_selection.h"
#include "refresh.h"
#include "international.h"
+#include "interface.h"
static GtkWidget *window;
@@ -23,11 +24,6 @@
static gdouble spin1 = 1;
static gdouble spin2 = 1;
static gboolean state_save=TRUE;
-static gboolean refresh_started = FALSE;
-
-/* interface */
-extern GtkWidget *save_at_refresh1;
-extern GtkWidget *save_as2;
/* layouts */
extern GtkListStore *command_info_table;
@@ -39,8 +35,8 @@
static gboolean
autorefresh_handler (gpointer data)
{
- gtk_list_store_clear (command_info_table);
- update_clist ();
+ on_refresh_clicked (NULL,NULL);
+
if (state_save)
{
time_t t;
@@ -59,24 +55,14 @@
cicle--;
if (!cicle) {
timeout_id = 0;
-
- if (window)
- {
-
- gtk_widget_set_sensitive (button1,TRUE);
- gtk_widget_set_sensitive (label1,TRUE);
- gtk_widget_set_sensitive (label5,TRUE);
- gtk_widget_set_sensitive (check_save,TRUE);
- gtk_widget_set_sensitive (spinbutton1,TRUE);
- gtk_widget_set_sensitive (spinbutton2,TRUE);
- gtk_widget_set_sensitive (button2,FALSE);
-
- }
-
- gtk_widget_set_sensitive (save_at_refresh1,TRUE);
- gtk_widget_set_sensitive (save_as2,TRUE);
-
- refresh_started = FALSE;
+
+ gtk_widget_set_sensitive (button1,TRUE);
+ gtk_widget_set_sensitive (label1,TRUE);
+ gtk_widget_set_sensitive (label5,TRUE);
+ gtk_widget_set_sensitive (check_save,TRUE);
+ gtk_widget_set_sensitive (spinbutton1,TRUE);
+ gtk_widget_set_sensitive (spinbutton2,TRUE);
+ gtk_widget_set_sensitive (button2,FALSE);
return FALSE;
}
@@ -93,11 +79,15 @@
cicle = gtk_spin_button_get_value_as_int((GtkSpinButton *)spinbutton2);
spin2 = (gdouble) cicle;
state_save = gtk_toggle_button_get_active ((GtkToggleButton *)check_save);
- gtk_widget_destroy (GTK_WIDGET(user_data));
- gtk_widget_set_sensitive (save_at_refresh1,FALSE);
- gtk_widget_set_sensitive (save_as2,FALSE);
- refresh_started = TRUE;
+ gtk_widget_set_sensitive (button1,FALSE);
+ gtk_widget_set_sensitive (label1,FALSE);
+ gtk_widget_set_sensitive (label5,FALSE);
+ gtk_widget_set_sensitive (check_save,FALSE);
+ gtk_widget_set_sensitive (spinbutton1,FALSE);
+ gtk_widget_set_sensitive (spinbutton2,FALSE);
+ gtk_widget_set_sensitive (button2,TRUE);
+
if (state_save)
on_save_as_clicked (NULL,GINT_TO_POINTER(4));
@@ -109,14 +99,7 @@
void
start_save_autorefresh (gchar *filename)
{
- if (!strlen(filename))
- {
- gtk_widget_set_sensitive (save_at_refresh1,TRUE);
- gtk_widget_set_sensitive (save_as2,TRUE);
- refresh_started = FALSE;
-
- return;
- }
+ if (!strlen(filename)) return;
filenameatrefresh = g_strdup (filename);
@@ -132,8 +115,6 @@
timeout_id = 0;
}
- gtk_widget_set_sensitive (save_at_refresh1,TRUE);
- gtk_widget_set_sensitive (save_as2,TRUE);
gtk_widget_set_sensitive (button1,TRUE);
gtk_widget_set_sensitive (label1,TRUE);
gtk_widget_set_sensitive (label5,TRUE);
@@ -142,7 +123,6 @@
gtk_widget_set_sensitive (spinbutton2,TRUE);
gtk_widget_set_sensitive (button2,FALSE);
- refresh_started = FALSE;
}
/* close with ESC or Return auto_refresh Dialog */
@@ -246,21 +226,8 @@
button2 = gtk_button_new_with_mnemonic (_("Stop"));
gtk_widget_show (button2);
gtk_container_add (GTK_CONTAINER (hbuttonbox4), button2);
+ gtk_widget_set_sensitive (button2,FALSE);
- if (refresh_started)
- {
- gtk_widget_set_sensitive (button1,FALSE);
- gtk_widget_set_sensitive (label1,FALSE);
- gtk_widget_set_sensitive (label5,FALSE);
- gtk_widget_set_sensitive (check_save,FALSE);
- gtk_widget_set_sensitive (spinbutton1,FALSE);
- gtk_widget_set_sensitive (spinbutton2,FALSE);
-
- }
- else
- {
- gtk_widget_set_sensitive (button2,FALSE);
- }
gtk_widget_show (window);
gdk_window_raise (window->window);
glsof.desktop
Description: application/desktop
# $Revision:$, $Date:$ Summary: GUI for lsof Summary(pl): GUI do lsof Name: glsof Version: 0.9.16 Release: 1 License: GPL Group: X11/Applications/System Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Source0-md5: 5ad5f2a6908be713753d9826c38e3e2c Source1: %{name}.desktop Patch0: %{name}-autorefresh.patch URL: http://glsof.sourceforge.net/ BuildRequires: gtk+2-devel >= 2.0.0 BuildRequires: libxml2-devel BuildRequires: pkgconfig Requires: lsof BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description glsof is a lsof GUI. You can Save output, Refresh (or Automatic Refresh) output, select fields of output and apply lsof commands. %description -l pl glsof to GUI do lsof. Możesz zachowywać wyjście, odświeżać (lub automatycznie odświeżać) wyjście, wybierać pola wyjścia i używać komend lsof. %prep %setup -q %patch0 -p1 %build %configure %{__make} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install pixmaps/logo.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS README %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/xml_data_type_doc %{_datadir}/%{name}/xml_data_type_doc/* %{_pixmapsdir}/* %{_desktopdir}/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log:$
_______________________________________________ pld-devel-pl mailing list [EMAIL PROTECTED] http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
