[Xfce4-commits] xfce4-genmon-plugin:master Allow timer period to be set at 250ms resolution. Patch from Miguel Guedes. Closes: #9102.
Updating branch refs/heads/master to 2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 (commit) from 6f1b36eb6576e0abcfb160ec12075445b29c9c75 (commit) commit 2d5fa307827a7b32af4f7b2ae0604f943e3a6e99 Author: John Lindgren john.lindg...@aol.com Date: Tue Aug 21 19:33:45 2012 -0400 Allow timer period to be set at 250ms resolution. Patch from Miguel Guedes. Closes: #9102. panel-plugin/config_gui.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c index a4c891d..90e55c1 100644 --- a/panel-plugin/config_gui.c +++ b/panel-plugin/config_gui.c @@ -106,8 +106,8 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, gtk_widget_show (alignment1); gtk_container_add (GTK_CONTAINER (eventbox1), alignment1); -wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 0); -wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 0); +wSc_Period_adj = gtk_adjustment_new (15, .25, 60*60*24, .25, 1, 0); +wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), .25, 2); gtk_widget_show (wSc_Period); gtk_container_add (GTK_CONTAINER (alignment1), wSc_Period); gtk_tooltips_set_tip (tooltips, wSc_Period, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Remove obsolete Glade files.
Updating branch refs/heads/master to bdc7f5034a0cf859853e353194779012fdd5e1e5 (commit) from b6a9f9f07717c6aa8e9d0b271b053662f0005328 (commit) commit bdc7f5034a0cf859853e353194779012fdd5e1e5 Author: John Lindgren john.lindg...@aol.com Date: Sat May 12 11:44:41 2012 -0400 Remove obsolete Glade files. glade/config_gui.glade | 354 --- glade/config_gui.gladep |7 - 2 files changed, 0 insertions(+), 361 deletions(-) diff --git a/glade/config_gui.glade b/glade/config_gui.glade deleted file mode 100644 index 32faba6..000 --- a/glade/config_gui.glade +++ /dev/null @@ -1,354 +0,0 @@ -?xml version=1.0 standalone=no? !--*- mode: xml -*-- -!DOCTYPE glade-interface SYSTEM http://glade.gnome.org/glade-2.0.dtd; - -glade-interface - -widget class=GtkWindow id=OptionDialog - property name=visibleTrue/property - property name=title translatable=yesOptionDialog/property - property name=typeGTK_WINDOW_TOPLEVEL/property - property name=window_positionGTK_WIN_POS_NONE/property - property name=modalFalse/property - property name=resizableTrue/property - property name=destroy_with_parentFalse/property - - child -widget class=GtkVBox id=vbox1 - property name=visibleTrue/property - property name=homogeneousFalse/property - property name=spacing0/property - - child - widget class=GtkButton id=wPB_About - property name=visibleTrue/property - property name=tooltip translatable=yesAbout.../property - property name=reliefGTK_RELIEF_NONE/property - - child - widget class=GtkAlignment id=alignment2 - property name=visibleTrue/property - property name=xalign0.5/property - property name=yalign0.5/property - property name=xscale0/property - property name=yscale0/property - - child - widget class=GtkHBox id=hbox3 - property name=visibleTrue/property - property name=homogeneousFalse/property - property name=spacing2/property - - child - widget class=GtkImage id=image1 - property name=visibleTrue/property - property name=stockgnome-stock-about/property - property name=icon_size4/property - property name=xalign0.5/property - property name=yalign0.5/property - property name=xpad0/property - property name=ypad0/property - /widget - packing - property name=padding0/property - property name=expandFalse/property - property name=fillFalse/property - /packing - /child - - child - widget class=GtkLabel id=label10 - property name=visibleTrue/property - property name=label translatable=yesGeneric Monitor/property - property name=use_underlineTrue/property - property name=use_markupFalse/property - property name=justifyGTK_JUSTIFY_LEFT/property - property name=wrapFalse/property - property name=selectableFalse/property - property name=xalign0.5/property - property name=yalign0.5/property - property name=xpad0/property - property name=ypad0/property - /widget - packing - property name=padding0/property - property name=expandFalse/property - property name=fillFalse/property - /packing - /child - /widget - /child - /widget - /child - /widget - packing - property name=padding0/property - property name=expandFalse/property - property name=fillFalse/property - /packing - /child - - child - widget class=GtkHSeparator id=hseparator9 - property name=visibleTrue/property - /widget - packing - property name=padding0/property - property name=expandTrue/property - property name=fillTrue/property - /packing - /child - - child - widget class=GtkTable id=table1 - property name=visibleTrue/property - property name=n_rows3/property - property name=n_columns2/property - property name=homogeneousFalse/property - property name=row_spacing0/property - property name=column_spacing0/property - - child - widget class=GtkLabel id=label1 - property name=visibleTrue/property - property name=label translatable=yesCommand/property - property name
[Xfce4-commits] xfce4-genmon-plugin:master Genmon 3.4.
Updating branch refs/heads/master to fee842a1bf82d3d762062bf2a3f11b314a4f6226 (commit) from bdc7f5034a0cf859853e353194779012fdd5e1e5 (commit) commit fee842a1bf82d3d762062bf2a3f11b314a4f6226 Author: John Lindgren john.lindg...@aol.com Date: Sat May 12 11:48:28 2012 -0400 Genmon 3.4. NEWS|7 +++ configure.ac.in |2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index c25a0b1..589e79b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +3.4 (2012/05/12) + + - Port from libxfcegui4 to libxfce4ui + - Install as a shared library rather than an executable + - No longer uses troublesome fixed-length text buffers + - Bug fixes + 3.3.1 (2012/01/02) == - Bug fixes, compiler and GTK+ warning fixes diff --git a/configure.ac.in b/configure.ac.in index 485ed7e..b18d18a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,7 +6,7 @@ dnl 2004 Roger Seguin roger_seg...@msn.com dnl 2006 Julien Devemy jujuc...@gmail.com dnl -m4_define([genmon_version],[3.3.1]) +m4_define([genmon_version],[3.4]) AC_INIT([xfce4-genmon-plugin], [genmon_version], [xfce-goodies-...@lists.berlios.de]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin|xfce4-genmon-plugin-3.4 Creating annotated tag xfce4-genmon-plugin-3.4
Updating annotated tag refs/tags/xfce4-genmon-plugin-3.4 as new annotated tag to 15761da3ce9de3161a66d251aee8fcc190270c83 (tag) succeeds xfce4-genmon-plugin-3.3.1-62-gbdc7f50 tagged by John Lindgren john.lindg...@aol.com on 2012-05-12 17:50 +0200 John Lindgren (1): Genmon 3.4. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Don't use fixed-length buffers. Closes: #8659.
Updating branch refs/heads/master to 1658dc71ea866fd28fa4c617cadc763260765b33 (commit) from e3b80386c076941bb43eac514143ab4a9d094b5b (commit) commit 1658dc71ea866fd28fa4c617cadc763260765b33 Author: John Lindgren john.lindg...@aol.com Date: Wed May 9 22:25:30 2012 -0400 Don't use fixed-length buffers. Closes: #8659. panel-plugin/cmdspawn.c | 81 +--- panel-plugin/cmdspawn.h | 29 +-- panel-plugin/main.c | 193 -- 3 files changed, 125 insertions(+), 178 deletions(-) diff --git a/panel-plugin/cmdspawn.c b/panel-plugin/cmdspawn.c index ae9de82..336acad 100644 --- a/panel-plugin/cmdspawn.c +++ b/panel-plugin/cmdspawn.c @@ -4,7 +4,8 @@ * Copyright (c) 2004 Roger Seguin roger_seg...@msn.com * http://rmlx.dyndns.org * Copyright (c) 2006 Julien Devemy jujuc...@gmail.com - * + * Copyright (c) 2012 John Lindgren john.lindg...@aol.com + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -53,44 +54,34 @@ /**/ -int genmon_Spawn (char *const argv[], char *const p_pcOutput, -const size_t p_BufferSize, const int wait) +char *genmon_Spawn (char **argv, int wait) /**/ /* Spawn a command and capture its output from stdout or stderr */ - /* Return 0 on success, otherwise -1 */ + /* Return allocated string on success, otherwise NULL */ { enum { OUT, ERR, OUT_ERR }; enum { RD, WR, RD_WR }; -const size_tBufSafeSize = p_BufferSize - 1; -// Make sure that the output string will be NULL-terminated + int aaiPipe[OUT_ERR][RD_WR]; pid_t pid; struct pollfd aoPoll[OUT_ERR]; -int fError; int status; int i, j, k; +char *str = NULL; -if (p_BufferSize = 0) { -fprintf (stderr, Spawn() error: Wrong buffer size!\n); -return (-1); -} -memset (p_pcOutput, 0, p_BufferSize); if (!(*argv)) { -strncpy (p_pcOutput, Spawn() error: No parameters passed!, -BufSafeSize); -return (-1); +fprintf (stderr, Spawn() error: No parameters passed!\n); +return (NULL); } for (i = 0; i OUT_ERR; i++) pipe (aaiPipe[i]); switch (pid = fork ()) { case -1: -i = errno; -snprintf (p_pcOutput, BufSafeSize, fork(%d): %s, i, -strerror (i)); +perror (fork()); for (i = 0; i OUT_ERR; i++) for (j = 0; j RD_WR; j++) close (aaiPipe[i][j]); -return (-1); +return (NULL); case 0: close(0); /* stdin is not used in child */ /* Redirect stdout/stderr to associated pipe's write-ends */ @@ -117,10 +108,7 @@ int genmon_Spawn (char *const argv[], char *const p_pcOutput, { status = waitpid (pid, 0, 0); if (status == -1) { -i = errno; -snprintf (p_pcOutput, BufSafeSize, waitpid(%d): %s, i, -strerror (i)); -fError = 1; +perror (waitpid()); goto End; } @@ -134,13 +122,23 @@ int genmon_Spawn (char *const argv[], char *const p_pcOutput, for (i = 0; i OUT_ERR; i++) if (aoPoll[i].revents POLLIN) break; -if (i OUT_ERR) -read (aaiPipe[i][RD], p_pcOutput, BufSafeSize); -fError = (i == OUT_ERR); +if (i == OUT_ERR) +goto End; + +j = 0; +while (1) { +str = g_realloc (str, j + 256); +if ((k = read (aaiPipe[i][RD], str + j, 255)) 0) +j += k; +else +break; +} +str[j] = 0; /* Remove trailing carriage return if any */ -if (p_pcOutput[(i = strlen (p_pcOutput) - 1)] == '\n') -p_pcOutput[i] = 0; +i = strlen (str) - 1; +if (i = 0 str[i] == '\n') +str[i] = 0; } End: @@ -148,44 +146,37 @@ int genmon_Spawn (char *const argv[], char *const p_pcOutput, for (i = 0; i OUT_ERR; i++) close (aaiPipe[i][RD]); -return (-fError); +return (str); }// Spawn() /**/ -int genmon_SpawnCmd (const char *const p_pcCmdLine, char *const p_pcOutput, -const size_t p_BufferSize, const int wait) +char *genmon_SpawnCmd (const char *p_pcCmdLine, int wait) /**/ /* Parse a command line, spawn the command, and capture its output from stdout or stderr */ - /* Return 0
[Xfce4-commits] xfce4-genmon-plugin:master Use an invisible event box window. Patch from David Schneider. Closes: #8407.
Updating branch refs/heads/master to 2a488de06506ff297ae6e686f5f2640e38ba9fdd (commit) from 114f6a6fbab359da19b788497a0da163115cc822 (commit) commit 2a488de06506ff297ae6e686f5f2640e38ba9fdd Author: John Lindgren john.lindg...@aol.com Date: Wed May 9 19:06:32 2012 -0400 Use an invisible event box window. Patch from David Schneider. Closes: #8407. panel-plugin/main.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 4c64a13..73248f9 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -317,6 +317,8 @@ static genmon_t *genmon_create_control (XfcePanelPlugin *plugin) strcpy (poConf-acFont, (default)); poMonitor-wEventBox = gtk_event_box_new (); +gtk_event_box_set_visible_window ( +GTK_EVENT_BOX (poMonitor-wEventBox), FALSE); gtk_widget_show (poMonitor-wEventBox); xfce_panel_plugin_add_action_widget (plugin, poMonitor-wEventBox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Compile the plugin as a module and install to lib instead of libexec. Patch from David Schneider.
Updating branch refs/heads/master to 0c4c582e87f1f0b4b36782b3d4dc021bffce93df (commit) from 2a488de06506ff297ae6e686f5f2640e38ba9fdd (commit) commit 0c4c582e87f1f0b4b36782b3d4dc021bffce93df Author: John Lindgren john.lindg...@aol.com Date: Wed May 9 19:10:20 2012 -0400 Compile the plugin as a module and install to lib instead of libexec. Patch from David Schneider. README|9 ++--- configure.ac.in |4 panel-plugin/Makefile.am | 24 +++- panel-plugin/genmon.desktop.in.in |3 ++- panel-plugin/main.c |2 +- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/README b/README index 16dd87c..27f7c5c 100644 --- a/README +++ b/README @@ -17,16 +17,19 @@ Do the usual stuff: - make install (as root) You should then end up with: -xfce4-genmon-plugin -installed in XFce4InstallationDir/libexec/xfce4/panel-plugins/ +libgenmon.so +libgenmon.la +installed in XFce4InstallationDir/lib/xfce4/panel/plugins/ and genmon.desktop -installed in XFce4InstallationDir/share/xfce4/panel-plugins/ +installed in XFce4InstallationDir/share/xfce4/panel/plugins/ xfce4-genmon-plugin.mo installed in XFce4InstallationDir/share/locale/XX/LC_MESSAGES/ where XX represents the languages supported by genmon plugin +You are encouraged to delete the installed libgenmon.la + 3 -Testing --- diff --git a/configure.ac.in b/configure.ac.in index a04d0ec..485ed7e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -27,6 +27,10 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_INTLTOOL +dnl Initialize libtool +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + dnl Check for standard header files AC_HEADER_STDC diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index f819ff6..6e32d7c 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,16 +1,22 @@ -plugindir = $(libexecdir)/xfce4/panel-plugins -plugin_PROGRAMS = xfce4-genmon-plugin +plugindir = $(libdir)/xfce4/panel/plugins +plugin_LTLIBRARIES = libgenmon.la -xfce4_genmon_plugin_CFLAGS = \ +libgenmon_la_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ @LIBXFCE4PANEL_CFLAGS@ \ @LIBXFCE4UI_CFLAGS@ -xfce4_genmon_plugin_LDADD =\ +libgenmon_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' + +libgenmon_la_LIBADD = \ @LIBXFCE4PANEL_LIBS@\ @LIBXFCE4UI_LIBS@ -xfce4_genmon_plugin_SOURCES = \ +libgenmon_la_SOURCES = \ main.c \ config_gui.h\ config_gui.c\ @@ -19,7 +25,7 @@ xfce4_genmon_plugin_SOURCES = \ # .desktop file # -# Some automake trickery here. Because we cannot use $(libexecdir) in the +# Some automake trickery here. Because we cannot use $(libdir) in the # automake stage, we'll use sed to get the full path into the .desktop file. # We also need to let intltool merge the translated fields, so we add an # additional level of indirection: a name.desktop.in.in file. @@ -27,7 +33,7 @@ xfce4_genmon_plugin_SOURCES = \ desktop_in_in_files = genmon.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) -desktopdir = $(datadir)/xfce4/panel-plugins +desktopdir = $(datadir)/xfce4/panel/plugins desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ @@ -38,7 +44,7 @@ DISTCLEANFILES = \ $(desktop_DATA) $(desktop_in_files) # get full path into .desktop file -%.desktop.in: %.desktop.in.in - sed -e s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^ \ +$(desktop_in_files): $(desktop_in_in_files) + sed -e s^@PLUGIN_PATH@^$(plugindir)^ \ $ $@ diff --git a/panel-plugin/genmon.desktop.in.in b/panel-plugin/genmon.desktop.in.in index 9508f9d..d412ee4 100644 --- a/panel-plugin/genmon.desktop.in.in +++ b/panel-plugin/genmon.desktop.in.in @@ -4,4 +4,5 @@ Encoding=UTF-8 _Name=Generic Monitor _Comment=Show output of a command. Icon=utilities-system-monitor -X-XFCE-Exec=@PLUGIN_PATH@/xfce4-genmon-plugin +X-XFCE-Module=genmon +X-XFCE-Internal=false diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 73248f9..05389cd 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -791,5 +791,5 @@ static void genmon_construct (XfcePanelPlugin *plugin
[Xfce4-commits] xfce4-genmon-plugin:master Removed desktop.in.in hackery. Patch from David Schneider.
Updating branch refs/heads/master to e3b80386c076941bb43eac514143ab4a9d094b5b (commit) from 0c4c582e87f1f0b4b36782b3d4dc021bffce93df (commit) commit e3b80386c076941bb43eac514143ab4a9d094b5b Author: John Lindgren john.lindg...@aol.com Date: Wed May 9 19:11:57 2012 -0400 Removed desktop.in.in hackery. Patch from David Schneider. panel-plugin/Makefile.am | 21 ++- .../{genmon.desktop.in.in = genmon.desktop.in}|0 po/POTFILES.in |3 +- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 6e32d7c..11e821c 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -23,28 +23,13 @@ libgenmon_la_SOURCES = \ cmdspawn.h \ cmdspawn.c -# .desktop file -# -# Some automake trickery here. Because we cannot use $(libdir) in the -# automake stage, we'll use sed to get the full path into the .desktop file. -# We also need to let intltool merge the translated fields, so we add an -# additional level of indirection: a name.desktop.in.in file. -# -desktop_in_in_files = genmon.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) - desktopdir = $(datadir)/xfce4/panel/plugins -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktop_DATA = genmon.desktop @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ - $(desktop_in_in_files) + genmon.desktop.in DISTCLEANFILES = \ - $(desktop_DATA) $(desktop_in_files) - -# get full path into .desktop file -$(desktop_in_files): $(desktop_in_in_files) - sed -e s^@PLUGIN_PATH@^$(plugindir)^ \ - $ $@ + $(desktop_DATA) diff --git a/panel-plugin/genmon.desktop.in.in b/panel-plugin/genmon.desktop.in similarity index 100% rename from panel-plugin/genmon.desktop.in.in rename to panel-plugin/genmon.desktop.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 3cc25fc..3d4d132 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ panel-plugin/cmdspawn.c panel-plugin/config_gui.c panel-plugin/main.c - -panel-plugin/genmon.desktop.in.in +panel-plugin/genmon.desktop.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master sizeof(char) is guaranteed to be 1.
Updating branch refs/heads/master to 56e88eb3aa0924e70adcb52970f23c2518b0151d (commit) from 66d4a4ffba06d5724ec90ec78b0f4145774ee7be (commit) commit 56e88eb3aa0924e70adcb52970f23c2518b0151d Author: John Lindgren john.lindg...@aol.com Date: Thu Feb 16 09:21:04 2012 -0500 sizeof(char) is guaranteed to be 1. panel-plugin/main.c | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 1f7a029..44413ba 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -154,12 +154,12 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) /* Test if the result is an Image or a Text */ begin=strstr(p_poPlugin-acValue, img); end=strstr(p_poPlugin-acValue, /img); -if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX*sizeof(char))) +if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX)) { char buf[BUFMAX]; /* Get the image path */ -strncpy(buf, begin+5*sizeof(char), end-begin-5*sizeof(char)); -buf[end-begin-5*sizeof(char)]='\0'; +strncpy(buf, begin+5, end-begin-5); +buf[end-begin-5]='\0'; gtk_image_set_from_file (GTK_IMAGE (poMonitor-wImage), buf); gtk_image_set_from_file (GTK_IMAGE (poMonitor-wImgButton), buf); @@ -167,12 +167,12 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) /* Test if the result has a clickable Image (button) */ begin=strstr(p_poPlugin-acValue, click); end=strstr(p_poPlugin-acValue, /click); -if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX*sizeof(char))) +if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX)) { char buf[BUFMAX]; /* Get the command path */ -strncpy(buf, begin+7*sizeof(char), end-begin-7*sizeof(char)); -buf[end-begin-7*sizeof(char)]='\0'; +strncpy(buf, begin+7, end-begin-7); +buf[end-begin-7]='\0'; strcpy(poMonitor-onClickCmd, buf); @@ -199,12 +199,12 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) /* Test if the result is a Text */ begin=strstr(p_poPlugin-acValue, txt); end=strstr(p_poPlugin-acValue, /txt); -if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX*sizeof(char))) +if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX)) { char buf[BUFMAX]; /* Get the text */ -strncpy(buf, begin+5*sizeof(char), end-begin-5*sizeof(char)); -buf[end-begin-5*sizeof(char)]='\0'; +strncpy(buf, begin+5, end-begin-5); +buf[end-begin-5]='\0'; gtk_label_set_markup (GTK_LABEL (poMonitor-wValue), buf); gtk_widget_show (poMonitor-wValue); @@ -216,13 +216,13 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) /* Test if the result is a Bar */ begin=strstr(p_poPlugin-acValue, bar); end=strstr(p_poPlugin-acValue, /bar); -if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX*sizeof(char))) +if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX)) { char buf[BUFMAX]; int value; /* Get the text */ -strncpy(buf, begin+5*sizeof(char), end-begin-5*sizeof(char)); -buf[end-begin-5*sizeof(char)]='\0'; +strncpy(buf, begin+5, end-begin-5); +buf[end-begin-5]='\0'; value=atoi(buf); if (value0) value=0; @@ -246,7 +246,7 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) /* Test if a ToolTip is given */ begin=strstr(p_poPlugin-acValue, tool); end=strstr(p_poPlugin-acValue, /tool); -if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX*sizeof(char))) +if ((begin != NULL) (end != NULL) (begin end) (end-begin BUFMAX)) { strncpy(acToolTips, begin+6, end-begin-6); acToolTips[end-begin-6]='\0'; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Use gtk_label_set_text() instead of gtk_label_set_markup() if newVersion == 0. Fixes: #8316.
Updating branch refs/heads/master to 14640c291ad12d4ae822cc24e98e0c2bc8ab48cd (commit) from 56e88eb3aa0924e70adcb52970f23c2518b0151d (commit) commit 14640c291ad12d4ae822cc24e98e0c2bc8ab48cd Author: John Lindgren john.lindg...@aol.com Date: Thu Feb 16 09:35:49 2012 -0500 Use gtk_label_set_text() instead of gtk_label_set_markup() if newVersion == 0. Fixes: #8316. panel-plugin/main.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 44413ba..4c64a13 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -239,7 +239,7 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) if (newVersion == 0) { gtk_widget_show (poMonitor-wValue); -gtk_label_set_markup (GTK_LABEL (poMonitor-wValue), +gtk_label_set_text (GTK_LABEL (poMonitor-wValue), p_poPlugin-acValue); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
xfce4-genmon-plugin:master Port to libxfce4ui. Patch from Andreas Müller. Closes: #8406.
Updating branch refs/heads/master to 84b188903d33db6e3f41b50cf8fb1d675c0882e7 (commit) from e82f2e07192fa2b4317f9f4a9523a26a9b71cfb6 (commit) commit 84b188903d33db6e3f41b50cf8fb1d675c0882e7 Author: John Lindgren john.lindg...@aol.com Date: Mon Jan 30 15:48:36 2012 -0500 Port to libxfce4ui. Patch from Andreas Müller. Closes: #8406. configure.ac.in |4 ++-- panel-plugin/Makefile.am |4 ++-- panel-plugin/cmdspawn.c |2 +- panel-plugin/config_gui.c |2 +- panel-plugin/config_gui.h |1 - panel-plugin/main.c | 17 ++--- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index b9d5bd3..a04d0ec 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -31,8 +31,8 @@ dnl Check for standard header files AC_HEADER_STDC dnl configure the panel plugin -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) dnl Translations XDT_I18N([@LINGUAS@]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 861a466..f819ff6 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -4,11 +4,11 @@ plugin_PROGRAMS = xfce4-genmon-plugin xfce4_genmon_plugin_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ + @LIBXFCE4UI_CFLAGS@ xfce4_genmon_plugin_LDADD =\ @LIBXFCE4PANEL_LIBS@\ - @LIBXFCEGUI4_LIBS@ + @LIBXFCE4UI_LIBS@ xfce4_genmon_plugin_SOURCES = \ main.c \ diff --git a/panel-plugin/cmdspawn.c b/panel-plugin/cmdspawn.c index aef7689..ae9de82 100644 --- a/panel-plugin/cmdspawn.c +++ b/panel-plugin/cmdspawn.c @@ -49,7 +49,7 @@ #include stdarg.h #include errno.h #include sys/wait.h -#include libxfcegui4/libxfcegui4.h +#include libxfce4ui/libxfce4ui.h /**/ diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c index 49ef267..3550c35 100644 --- a/panel-plugin/config_gui.c +++ b/panel-plugin/config_gui.c @@ -28,7 +28,7 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#include libxfcegui4/dialogs.h +#include libxfce4ui/libxfce4ui.h #include libxfce4panel/xfce-panel-plugin.h diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h index 84024b2..c6bb672 100644 --- a/panel-plugin/config_gui.h +++ b/panel-plugin/config_gui.h @@ -29,7 +29,6 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#include libxfcegui4/dialogs.h #include libxfce4panel/xfce-panel-plugin.h diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 1f741ee..4a15710 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -31,8 +31,7 @@ #include gtk/gtk.h #include libxfce4util/libxfce4util.h -#include libxfcegui4/dialogs.h -#include libxfcegui4/xfce-exec.h +#include libxfce4ui/libxfce4ui.h #include libxfce4panel/xfce-panel-plugin.h #include libxfce4panel/xfce-panel-convenience.h @@ -98,7 +97,7 @@ static void ExecOnClickCmd (Widget_t p_wSc, void *p_pvPlugin) struct monitor_t *poMonitor = (poPlugin-oMonitor); GError *error = NULL; - xfce_exec(poMonitor-onClickCmd, 0, 0, error); +xfce_spawn_command_line_on_screen( gdk_screen_get_default(), poMonitor-onClickCmd, 0, 0, error ); if (error) { char first[256]; g_snprintf (first, sizeof(first), _(Could not run \%s\), poMonitor-onClickCmd); @@ -592,7 +591,8 @@ static void UpdateConf (void *p_pvPlugin) static void About (Widget_t w, void *unused) /* Called back when the About button in clicked */ { -xfce_info (_(%s %s - Generic Monitor\n +xfce_dialog_show_info (NULL, NULL, +_(%s %s - Generic Monitor\n Cyclically spawns a script/program, captures its output and displays the resulting string in the panel\n\n (c) 2004 Roger Seguin roger_seg...@msn.com\n @@ -646,7 +646,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin, /* Plugin API */ /* Create/pop up the configuration/options GUI */ { -GtkWidget *dlg, *header, *vbox; +GtkWidget *dlg, *vbox; struct param_t *poConf = (poPlugin-oConf.oParam); struct gui_t *poGUI = (poPlugin-oConf.oGUI); const char *pcFont = poConf-acFont; @@ -667,12 +667,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin, gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); -header = xfce_create_header (NULL, _(Generic Monitor)); -gtk_widget_set_size_request (GTK_BIN (header)-child, -1, 32); -gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2
[Xfce4-commits] xfce4-genmon-plugin:master xfce_titled_dialog_set_subtitle cannot be called on a generic GtkDialog.
Updating branch refs/heads/master to e17e8e86430be14f18eb30e7f6cf4ad390622d31 (commit) from 84b188903d33db6e3f41b50cf8fb1d675c0882e7 (commit) commit e17e8e86430be14f18eb30e7f6cf4ad390622d31 Author: John Lindgren john.lindg...@aol.com Date: Mon Jan 30 19:10:21 2012 -0500 xfce_titled_dialog_set_subtitle cannot be called on a generic GtkDialog. panel-plugin/main.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 4a15710..4bcd5c9 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -655,7 +655,7 @@ static void genmon_create_options (XfcePanelPlugin *plugin, xfce_panel_plugin_block_menu (plugin); -dlg = gtk_dialog_new_with_buttons (_(Configuration), +dlg = xfce_titled_dialog_new_with_buttons (_(Configuration), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Cosmetic fixes.
Updating branch refs/heads/master to 0286c5852a1bb04d2f0c40f4569c56edc0ade325 (commit) from e17e8e86430be14f18eb30e7f6cf4ad390622d31 (commit) commit 0286c5852a1bb04d2f0c40f4569c56edc0ade325 Author: John Lindgren john.lindg...@aol.com Date: Mon Jan 30 19:27:45 2012 -0500 Cosmetic fixes. panel-plugin/config_gui.c | 36 panel-plugin/config_gui.h |3 +-- panel-plugin/main.c | 11 +++ 3 files changed, 4 insertions(+), 46 deletions(-) diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c index 3550c35..a4c891d 100644 --- a/panel-plugin/config_gui.c +++ b/panel-plugin/config_gui.c @@ -54,12 +54,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, struct gui_t *p_poGUI) { -GtkWidget *wPB_About; -GtkWidget *alignment2; -GtkWidget *hbox3; -GtkWidget *image1; -GtkWidget *label10; -GtkWidget *hseparator9; GtkWidget *table1; GtkWidget *label1; GtkWidget *wTF_Cmd; @@ -80,35 +74,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, tooltips = gtk_tooltips_new (); -wPB_About = gtk_button_new (); -gtk_widget_show (wPB_About); -gtk_box_pack_start (GTK_BOX (vbox1), wPB_About, FALSE, FALSE, 0); -GTK_WIDGET_UNSET_FLAGS (wPB_About, GTK_CAN_FOCUS); -gtk_tooltips_set_tip (tooltips, wPB_About, _(About...), NULL); -gtk_button_set_relief (GTK_BUTTON (wPB_About), GTK_RELIEF_NONE); - -alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0); -gtk_widget_show (alignment2); -gtk_container_add (GTK_CONTAINER (wPB_About), alignment2); - -hbox3 = gtk_hbox_new (FALSE, 2); -gtk_widget_show (hbox3); -gtk_container_add (GTK_CONTAINER (alignment2), hbox3); - -image1 = gtk_image_new_from_stock (gnome-stock-about, -GTK_ICON_SIZE_BUTTON); -gtk_widget_show (image1); -gtk_box_pack_start (GTK_BOX (hbox3), image1, FALSE, FALSE, 0); - -label10 = gtk_label_new_with_mnemonic (_(Generic Monitor)); -gtk_widget_show (label10); -gtk_box_pack_start (GTK_BOX (hbox3), label10, FALSE, FALSE, 0); -gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT); - -hseparator9 = gtk_hseparator_new (); -gtk_widget_show (hseparator9); -gtk_box_pack_start (GTK_BOX (vbox1), hseparator9, TRUE, TRUE, 0); - table1 = gtk_table_new (3, 2, FALSE); gtk_widget_show (table1); gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, TRUE, 0); @@ -205,7 +170,6 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT); if (p_poGUI) { -COPYVAL (p_poGUI, wPB_About); COPYVAL (p_poGUI, wTF_Cmd); COPYVAL (p_poGUI, wTB_Title); COPYVAL (p_poGUI, wTF_Title); diff --git a/panel-plugin/config_gui.h b/panel-plugin/config_gui.h index c6bb672..47fa984 100644 --- a/panel-plugin/config_gui.h +++ b/panel-plugin/config_gui.h @@ -3,7 +3,7 @@ * Header file to construct the configure GUI * Copyright (c) 2004 Roger Seguin roger_seg...@msn.com * http://rmlx.dyndns.org - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -34,7 +34,6 @@ typedef struct gui_t { /* Configuration GUI widgets */ -GtkWidget *wPB_About; GtkWidget *wTF_Cmd; GtkWidget *wTB_Title; GtkWidget *wTF_Title; diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 4bcd5c9..1f7a029 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -591,12 +591,12 @@ static void UpdateConf (void *p_pvPlugin) static void About (Widget_t w, void *unused) /* Called back when the About button in clicked */ { -xfce_dialog_show_info (NULL, NULL, -_(%s %s - Generic Monitor\n -Cyclically spawns a script/program, captures its output +xfce_dialog_show_info (NULL, +_(Cyclically spawns a script/program, captures its output and displays the resulting string in the panel\n\n (c) 2004 Roger Seguin roger_seg...@msn.com\n (c) 2006 Julien Devemy jujuc...@gmail.com), +_(%s %s - Generic Monitor), PACKAGE, VERSION); }/* About() */ @@ -665,8 +665,6 @@ static void genmon_create_options (XfcePanelPlugin *plugin, g_signal_connect (dlg, response, G_CALLBACK (genmon_dialog_response), poPlugin); -gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), _(Generic Monitor)); vbox = gtk_vbox_new(FALSE, BORDER); @@ -679,9 +677,6 @@ static void genmon_create_options (XfcePanelPlugin *plugin, (void) genmon_CreateConfigGUI (GTK_WIDGET (vbox), poGUI); -g_signal_connect (GTK_WIDGET (poGUI-wPB_About), clicked, -G_CALLBACK (About), 0
[Xfce4-commits] xfce4-genmon-plugin:master Genmon 3.3.1.
Updating branch refs/heads/master to c1c2f67f3c00a81e6f8e7423e4e18f7da9707600 (commit) from 954af19036e17c1fd9a7361047c3a13051e746cc (commit) commit c1c2f67f3c00a81e6f8e7423e4e18f7da9707600 Author: John Lindgren john.lindg...@aol.com Date: Mon Jan 2 09:32:15 2012 -0500 Genmon 3.3.1. NEWS|4 configure.ac.in |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index bca1294..c25a0b1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +3.3.1 (2012/01/02) +== +- Bug fixes, compiler and GTK+ warning fixes + 3.3 (2011/03/21) - Support for xfce 4.8 diff --git a/configure.ac.in b/configure.ac.in index d338c58..b9d5bd3 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,7 +6,7 @@ dnl 2004 Roger Seguin roger_seg...@msn.com dnl 2006 Julien Devemy jujuc...@gmail.com dnl -m4_define([genmon_version],[3.3.0]) +m4_define([genmon_version],[3.3.1]) AC_INIT([xfce4-genmon-plugin], [genmon_version], [xfce-goodies-...@lists.berlios.de]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-genmon-plugin
Updating branch refs/heads/master to 9b029e85532aeb97781ce1d4ac9f1b1cff07b247 (commit) from c1c2f67f3c00a81e6f8e7423e4e18f7da9707600 (commit) commit 9b029e85532aeb97781ce1d4ac9f1b1cff07b247 Merge: c1c2f67 78f120b Author: John Lindgren john.lindg...@aol.com Date: Mon Jan 2 09:32:58 2012 -0500 Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-genmon-plugin commit 78f120b6e236ad9d57ea327a595cb91c2bd39af4 Author: Carles Muñoz Gorriz carle...@internautas.org Date: Mon Jan 2 14:43:12 2012 +0100 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 19 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ca.po | 27 +++ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/po/ca.po b/po/ca.po index 46fbd4f..e31632e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,30 +9,31 @@ msgid msgstr Project-Id-Version: xfce4-genmon-plugin 2.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-03-15 11:06+\n +POT-Creation-Date: 2012-01-02 09:51+\n PO-Revision-Date: 2006-12-03 11:32+0100\n Last-Translator: Carles Muñoz Gorriz carle...@internautas.org\n Language-Team: Catalan xfce-i...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: ca\n Plural-Forms: Plural-Forms: nplurals=2; plural=(n 1);\n X-Poedit-SourceCharset: utf-8\n #: ../panel-plugin/cmdspawn.c:174 #, c-format msgid Error in command \%s\ -msgstr Error a la comanda \%s\ +msgstr Error en l'rdre «%s» #: ../panel-plugin/cmdspawn.c:177 ../panel-plugin/main.c:105 msgid Xfce Panel -msgstr Panell Xfce +msgstr Quadre de Xfce #: ../panel-plugin/config_gui.c:87 msgid About... msgstr Quant a… -#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:677 +#: ../panel-plugin/config_gui.c:103 ../panel-plugin/main.c:670 #: ../panel-plugin/genmon.desktop.in.in.h:1 msgid Generic Monitor msgstr Monitor genèric @@ -80,31 +81,33 @@ msgstr (tipus de lletra per defecte) #: ../panel-plugin/main.c:104 #, c-format msgid Could not run \%s\ -msgstr No s'ha pogut executar \%s\ +msgstr No s'ha pogut executar «%s» -#: ../panel-plugin/main.c:602 +#: ../panel-plugin/main.c:595 #, c-format msgid %s %s - Generic Monitor\n -Cyclically spawns a script/program, captures its output and displays the resulting string in the panel\n +Cyclically spawns a script/program, captures its output and displays the +resulting string in the panel\n \n (c) 2004 Roger Seguin roger_seg...@msn.com\n (c) 2006 Julien Devemy jujuc...@gmail.com msgstr %s %s - Monitor genèric\n -executa un fitxer de seqüència («script») o programa de forma cíclica, captura el text de la seva sortida i el mostra al quadre.\n +executa un fitxer de seqüència («script») o programa de forma cíclica, +captura el text de la seva sortida i el mostra al quadre.\n \n (c) 2004 Roger Seguin roger_seg...@msn.com\n (c) 2006 Julien Devemy jujuc...@gmail.com -#: ../panel-plugin/main.c:620 +#: ../panel-plugin/main.c:613 msgid Font Selection msgstr Selecció del tipus de lletra -#: ../panel-plugin/main.c:665 +#: ../panel-plugin/main.c:658 msgid Configuration msgstr Configuració #: ../panel-plugin/genmon.desktop.in.in.h:2 -msgid Show output of a command. -msgstr Mostra la sortida d'una comanda. +msgid Show output of a command. +msgstr Mostra la sortida d'una ordre. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin|xfce4-genmon-plugin-3.3.1 Creating annotated tag xfce4-genmon-plugin-3.3.1
Updating annotated tag refs/tags/xfce4-genmon-plugin-3.3.1 as new annotated tag to 103dbb1cd826600eb4e33a8995b604244aaf39b0 (tag) succeeds V3.3.0-29-gc1c2f67 tagged by John Lindgren john.lindg...@aol.com on 2012-01-02 15:36 +0100 Carles Muñoz Gorriz (1): l10n: Updated Catalan (Valencian) (ca) translation to 100% John Lindgren (1): Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-genmon-plugin ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Fix compiler warning (incompatible pointer type).
Updating branch refs/heads/master to 2a9c958cc1cd86bd1172f8dadd1dc3fbae3d3fa2 (commit) from b27fd3e5f5a2b4465e1c58c90e0e48be6850012e (commit) commit 2a9c958cc1cd86bd1172f8dadd1dc3fbae3d3fa2 Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 15:43:13 2012 -0500 Fix compiler warning (incompatible pointer type). panel-plugin/main.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index f59886e..0d1bdb6 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -121,7 +121,7 @@ static int DisplayCmdOutput (struct genmon_t *p_poPlugin) struct param_t *poConf = (p_poPlugin-oConf.oParam); struct monitor_t *poMonitor = (p_poPlugin-oMonitor); char acToolTips[256]; -char acCompleteCmd[256]; +char acCompleteCmd[256]; intstatus; char *begin; char *end; @@ -747,7 +747,7 @@ static void genmon_set_orientation (XfcePanelPlugin *plugin, (poMonitor-wBox), BORDER); gtk_container_add (GTK_CONTAINER (poMonitor-wEventBox), poMonitor-wBox); - gtk_event_box_set_visible_window(poMonitor-wEventBox, FALSE); +gtk_event_box_set_visible_window (GTK_EVENT_BOX (poMonitor-wEventBox), FALSE); poMonitor-wTitle = gtk_label_new (poConf-acTitle); if (poConf-fTitleDisplayed) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Fix GtkSpinButton: setting an adjustment with non-zero page size is deprecated warning.
Updating branch refs/heads/master to cff8ed40cf4ffeb5d37b377b87c0e92cf9a3a44c (commit) from 2a9c958cc1cd86bd1172f8dadd1dc3fbae3d3fa2 (commit) commit cff8ed40cf4ffeb5d37b377b87c0e92cf9a3a44c Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 15:55:34 2012 -0500 Fix GtkSpinButton: setting an adjustment with non-zero page size is deprecated warning. panel-plugin/config_gui.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c index 90162d0..49ef267 100644 --- a/panel-plugin/config_gui.c +++ b/panel-plugin/config_gui.c @@ -3,7 +3,7 @@ * Construct the configure GUI * Copyright (c) 2004 Roger Seguin roger_seg...@msn.com * http://rmlx.dyndns.org - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -141,7 +141,7 @@ int genmon_CreateConfigGUI (GtkWidget *vbox1, gtk_widget_show (alignment1); gtk_container_add (GTK_CONTAINER (eventbox1), alignment1); -wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 10); +wSc_Period_adj = gtk_adjustment_new (15, 1, 60*60*24, 1, 1, 0); wSc_Period = gtk_spin_button_new (GTK_ADJUSTMENT (wSc_Period_adj), 1, 0); gtk_widget_show (wSc_Period); gtk_container_add (GTK_CONTAINER (alignment1), wSc_Period); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Change .desktop file icon to utilities-system-monitor. Closes: #6701.
Updating branch refs/heads/master to 2fd3d192741de9eb97a84e8fae7db49a2dc4b0e1 (commit) from cff8ed40cf4ffeb5d37b377b87c0e92cf9a3a44c (commit) commit 2fd3d192741de9eb97a84e8fae7db49a2dc4b0e1 Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 16:03:12 2012 -0500 Change .desktop file icon to utilities-system-monitor. Closes: #6701. panel-plugin/genmon.desktop.in.in |5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/panel-plugin/genmon.desktop.in.in b/panel-plugin/genmon.desktop.in.in index d677ef6..9508f9d 100644 --- a/panel-plugin/genmon.desktop.in.in +++ b/panel-plugin/genmon.desktop.in.in @@ -2,7 +2,6 @@ Type=X-XFCE-PanelPlugin Encoding=UTF-8 _Name=Generic Monitor -_Comment=Show output of a command. -Icon=xfce-mouse +_Comment=Show output of a command. +Icon=utilities-system-monitor X-XFCE-Exec=@PLUGIN_PATH@/xfce4-genmon-plugin - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Fix genmon not being initialized on startup (regression introduced by rev 5d9618659709). Closes: #7449.
Updating branch refs/heads/master to 78e457ae136015a7cc2260bb4e95cc14307f450e (commit) from 2fd3d192741de9eb97a84e8fae7db49a2dc4b0e1 (commit) commit 78e457ae136015a7cc2260bb4e95cc14307f450e Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 16:16:36 2012 -0500 Fix genmon not being initialized on startup (regression introduced by rev 5d9618659709). Closes: #7449. panel-plugin/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 0d1bdb6..3195959 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -835,6 +835,7 @@ static void genmon_construct (XfcePanelPlugin *plugin) gtk_container_add (GTK_CONTAINER (plugin), genmon-oMonitor.wEventBox); SetMonitorFont (genmon); +SetTimer (genmon); g_signal_connect (plugin, free-data, G_CALLBACK (genmon_free), genmon); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Remove scripts/samples.txt at request of author. Closes: #7657.
Updating branch refs/heads/master to 71f4c9cedb1f0bf0b072cbf95101bd946dfa8363 (commit) from 78e457ae136015a7cc2260bb4e95cc14307f450e (commit) commit 71f4c9cedb1f0bf0b072cbf95101bd946dfa8363 Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 16:19:45 2012 -0500 Remove scripts/samples.txt at request of author. Closes: #7657. scripts/samples.txt | 19 --- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/scripts/samples.txt b/scripts/samples.txt deleted file mode 100644 index de0932c..000 --- a/scripts/samples.txt +++ /dev/null @@ -1,19 +0,0 @@ -$Revision: 1.1 $ - -The following samples were provided by Edward Herr - -CPU HD temp script: - -#!/bin/bash -CPUTEMP=`acpi -ABt | cut -d -f 9 | cut -d . -f 1` -DISKTEMP=`hddtemp -n /dev/hda` -echo cpu $CPUTEMP -echo hda $DISKTEMP - -and wireless bitrate... - -#!/bin/bash -BITRATE=`/sbin/iwconfig eth1|grep Bit Rate|cut -d : -f 2|cut -d -f 1` -if [ $BITRATE ]; then echo $BITRATE -else echo 00 Mb/s -fi ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-genmon-plugin:master Use xfce_hvbox so we don't need to recreate widgets on changing orientation. Closes: #7366.
Updating branch refs/heads/master to 4f734ec74128142f2d2f2993868cdfbcd4d6d265 (commit) from 71f4c9cedb1f0bf0b072cbf95101bd946dfa8363 (commit) commit 4f734ec74128142f2d2f2993868cdfbcd4d6d265 Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 19:19:58 2012 -0500 Use xfce_hvbox so we don't need to recreate widgets on changing orientation. Closes: #7366. panel-plugin/main.c | 73 +-- 1 files changed, 7 insertions(+), 66 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 3195959..1f741ee 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -297,6 +297,7 @@ static genmon_t *genmon_create_control (XfcePanelPlugin *plugin) struct genmon_t *poPlugin; struct param_t *poConf; struct monitor_t *poMonitor; +GtkOrientation orientation = xfce_panel_plugin_get_orientation (plugin); int size = xfce_panel_plugin_get_size (plugin); poPlugin = g_new (genmon_t, 1); @@ -321,10 +322,7 @@ static genmon_t *genmon_create_control (XfcePanelPlugin *plugin) xfce_panel_plugin_add_action_widget (plugin, poMonitor-wEventBox); -if (xfce_panel_plugin_get_orientation (plugin) == GTK_ORIENTATION_HORIZONTAL) -poMonitor-wBox = gtk_hbox_new (FALSE, 0); -else -poMonitor-wBox = gtk_vbox_new (FALSE, 0); +poMonitor-wBox = xfce_hvbox_new (orientation, FALSE, 0); gtk_widget_show (poMonitor-wBox); gtk_container_set_border_width (GTK_CONTAINER (poMonitor-wBox), BORDER); @@ -337,13 +335,8 @@ static genmon_t *genmon_create_control (XfcePanelPlugin *plugin) gtk_box_pack_start (GTK_BOX (poMonitor-wBox), GTK_WIDGET (poMonitor-wTitle), FALSE, FALSE, 0); -/* Create a Box to put image and text - * If panel size less 25 place icon near the text - */ -if (size 25) -poMonitor-wImgBox = gtk_hbox_new (FALSE, 0); -else -poMonitor-wImgBox = gtk_vbox_new (FALSE, 0); +/* Create a Box to put image and text */ +poMonitor-wImgBox = xfce_hvbox_new (orientation, FALSE, 0); gtk_widget_show (poMonitor-wImgBox); gtk_container_set_border_width (GTK_CONTAINER (poMonitor-wImgBox), 0); @@ -376,7 +369,7 @@ static genmon_t *genmon_create_control (XfcePanelPlugin *plugin) poMonitor-wBar = gtk_progress_bar_new(); gtk_box_pack_start (GTK_BOX (poMonitor-wBox), GTK_WIDGET (poMonitor-wBar), FALSE, FALSE, 0); -if (xfce_panel_plugin_get_orientation (plugin) == GTK_ORIENTATION_HORIZONTAL) +if (orientation == GTK_ORIENTATION_HORIZONTAL) gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(poMonitor-wBar), GTK_PROGRESS_BOTTOM_TO_TOP); else gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(poMonitor-wBar), GTK_PROGRESS_LEFT_TO_RIGHT); @@ -734,61 +727,9 @@ static void genmon_set_orientation (XfcePanelPlugin *plugin, struct param_t *poConf = (poPlugin-oConf.oParam); struct monitor_t *poMonitor = (poPlugin-oMonitor); -TRACE (genmon_set_orientation()\n); - -gtk_container_remove (GTK_CONTAINER (poMonitor-wEventBox), -GTK_WIDGET (poMonitor-wBox)); -if (p_iOrientation == GTK_ORIENTATION_HORIZONTAL) -poMonitor-wBox = gtk_hbox_new (FALSE, 0); -else -poMonitor-wBox = gtk_vbox_new (FALSE, 0); -gtk_widget_show (poMonitor-wBox); -gtk_container_set_border_width (GTK_CONTAINER -(poMonitor-wBox), BORDER); -gtk_container_add (GTK_CONTAINER (poMonitor-wEventBox), -poMonitor-wBox); -gtk_event_box_set_visible_window (GTK_EVENT_BOX (poMonitor-wEventBox), FALSE); - -poMonitor-wTitle = gtk_label_new (poConf-acTitle); -if (poConf-fTitleDisplayed) -gtk_widget_show (poMonitor-wTitle); -gtk_box_pack_start (GTK_BOX (poMonitor-wBox), -GTK_WIDGET (poMonitor-wTitle), FALSE, FALSE, 0); - -/* Create a VBox to put image and text */ -poMonitor-wImgBox = gtk_vbox_new (FALSE, 0); -gtk_widget_show (poMonitor-wImgBox); -gtk_container_set_border_width (GTK_CONTAINER -(poMonitor-wImgBox), 0); -gtk_container_add (GTK_CONTAINER (poMonitor-wBox), -poMonitor-wImgBox); +xfce_hvbox_set_orientation (XFCE_HVBOX (poMonitor-wBox), p_iOrientation); +xfce_hvbox_set_orientation (XFCE_HVBOX (poMonitor-wImgBox), p_iOrientation); -/* Add Image */ -poMonitor-wImage = gtk_image_new (); -gtk_box_pack_start (GTK_BOX (poMonitor-wImgBox), -GTK_WIDGET (poMonitor-wImage), TRUE, FALSE, 0); - -/* Add Button */ -poMonitor-wButton = gtk_button_new (); -gtk_box_pack_start (GTK_BOX (poMonitor-wImgBox), -GTK_WIDGET (poMonitor-wButton), TRUE, FALSE, 0); - -/* Add Image Button*/ -poMonitor-wImgButton = gtk_image_new (); -gtk_container_add (GTK_CONTAINER (poMonitor-wButton), poMonitor-wImgButton); -gtk_container_set_border_width (GTK_CONTAINER (poMonitor-wButton), 0); - - /* Add Value */ -poMonitor-wValue
[Xfce4-commits] xfce4-genmon-plugin:master Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-genmon-plugin
Updating branch refs/heads/master to 954af19036e17c1fd9a7361047c3a13051e746cc (commit) from 4f734ec74128142f2d2f2993868cdfbcd4d6d265 (commit) commit 954af19036e17c1fd9a7361047c3a13051e746cc Merge: 4f734ec 77385d2 Author: John Lindgren john.lindg...@aol.com Date: Sun Jan 1 19:22:44 2012 -0500 Merge branch 'master' of ssh://git.xfce.org/panel-plugins/xfce4-genmon-plugin commit 77385d2ad6fa9d62cd7f0b3b700f1626d9500eba Author: Pjotr Anon pliniusmi...@gmail.com Date: Sun Jan 1 23:19:18 2012 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 19 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index fd7f42d..cc1c2c9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,6 +1,6 @@ # Dutch translation of the xfce4-genmon-plugin package. # Copyright (C) The Xfce development team. -# This file is distributed under the same license as the +# This file is distributed under the same license as the # xfce4-genmon-plugin package. # Pjotr, 2011. # @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-genmon-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2011-09-09 04:07+\n +POT-Creation-Date: 2012-01-01 21:39+\n PO-Revision-Date: 2011-09-09 11:34+0200\n Last-Translator: Pjotr\n Language-Team: Dutch (Flemish)\n @@ -107,5 +107,5 @@ msgid Configuration msgstr Configuratie #: ../panel-plugin/genmon.desktop.in.in.h:2 -msgid Show output of a command. +msgid Show output of a command. msgstr Toon uitvoer van een opdracht. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits