diff options
author | Davyd Madeley <davyd@madeley.id.au> | 2006-02-05 13:27:01 +0000 |
---|---|---|
committer | Davyd Madeley <davyd@src.gnome.org> | 2006-02-05 13:27:01 +0000 |
commit | c637a137681cc446d2f6011ac6d1c6487b60e5b0 (patch) | |
tree | 325771d45d423be15faad18be3493a9b0386ef4a | |
parent | 55b9f0c2750b287b3cc4c2b17e0502347388234f (diff) |
release GNOME-Applets 2.12.3GNOME_APPLETS_2_12_3
2005-02-05 Davyd Madeley <davyd@madeley.id.au>
* NEWS:
* configure.in: release GNOME-Applets 2.12.3
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | NEWS | 16 | ||||
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | mini-commander/command_line.c | 185 | ||||
-rw-r--r-- | mini-commander/exec.c | 121 |
5 files changed, 23 insertions, 308 deletions
@@ -1,3 +1,8 @@ +2005-02-05 Davyd Madeley <davyd@madeley.id.au> + + * NEWS: + * configure.in: release GNOME-Applets 2.12.3 + 2005-10-28 Davyd Madeley <davyd@madeley.id.au> * NEWS: @@ -1,3 +1,19 @@ +Changes in GNOME-Applets 2.13.3 +=============================== +"No more fixes do you require, already build you, that what you need" + +This is the third maintainance release of GNOME Applets, there are no fixes in +this release, only translation updates. + +Translations: + - bg (Alexander Shopov) + - et (Ivar Smolin) + - fr (Christophe Merlet, Christophe Bliard) + - ko (Changwoo Ryu) + - pl (GNOME PL Team) + - te (Prajasakti Localisation Team) + - zh_TW (Abel Cheung) + Changes in GNOME-Applets 2.12.2 ================================ "Not for Critics" diff --git a/configure.in b/configure.in index 3bebff5a3..49f5e6e1c 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(drivemount/drivemount.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(gnome-applets, 2.12.2) +AM_INIT_AUTOMAKE(gnome-applets, 2.12.3) AM_MAINTAINER_MODE @@ -344,7 +344,7 @@ dnl *************************************** LIBNOTIFY_CFLAGS= LIBNOTIFY_LIBS= -PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED, +PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED libnotify < 0.3, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") if test "x$HAVE_LIBNOTIFY" = "xyes"; then diff --git a/mini-commander/command_line.c b/mini-commander/command_line.c deleted file mode 100644 index 0d050273f..000000000 --- a/mini-commander/command_line.c +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Mini-Commander Applet - * Copyright (C) 1998 Oliver Maruhn <om@linuxhq.com> - * - * Author: Oliver Maruhn <om@linuxhq.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <string.h> -#include <config.h> -#include <gnome.h> -#include <applet-widget.h> -#include <gdk/gdkkeysyms.h> - -#include "command_line.h" -#include "preferences.h" -#include "exec.h" -#include "cmd_completion.h" -#include "message.h" - -GtkWidget *entryCommand; -static int historyPosition = HISTORY_DEPTH; -static char *historyCommand[HISTORY_DEPTH]; - -static gint commandKey_event(GtkWidget *widget, GdkEventKey *event, gpointer data) -{ - guint key = event->keyval; - char *command; - static char currentCommand[MAX_COMMAND_LENGTH]; - char buffer[MAX_COMMAND_LENGTH]; - int propagateEvent = TRUE; - int pos; - - /* printf("%d,%d,%d; ", (gint16) event->keyval, event->state, event->length); */ - - if(key == GDK_Tab) - { - /* tab key pressed */ - strcpy(buffer, (char *) gtk_entry_get_text(GTK_ENTRY(widget))); - cmdCompletion(buffer); - gtk_entry_set_text(GTK_ENTRY(widget), (gchar *) buffer); - - propagateEvent = FALSE; - } - else if(key == GDK_Up) - { - /* up key pressed */ - if(historyPosition == HISTORY_DEPTH) - { - /* store current command line */ - strcpy(currentCommand, (char *) gtk_entry_get_text(GTK_ENTRY(widget))); - } - if(historyPosition > 0 && historyCommand[historyPosition - 1] != NULL) - { - gtk_entry_set_text(GTK_ENTRY(widget), (gchar *) historyCommand[--historyPosition]); - } - event->keyval = (gchar) -175; - propagateEvent = FALSE; - } - else if(key == GDK_Down) - { - /* down key pressed */ - if(historyPosition < HISTORY_DEPTH - 1) - { - gtk_entry_set_text(GTK_ENTRY(widget), (gchar *) historyCommand[++historyPosition]); - } - else if(historyPosition == HISTORY_DEPTH - 1) - { - gtk_entry_set_text(GTK_ENTRY(widget), (gchar *) currentCommand); - ++historyPosition; - } - propagateEvent = FALSE; - } - else if(key == GDK_Return) - { - /* enter pressed -> exec command */ - showMessage((gchar *) _("starting...")); - command = (char *) malloc(sizeof(char) * MAX_COMMAND_LENGTH); - strcpy(command, (char *) gtk_entry_get_text(GTK_ENTRY(widget))); - /* printf("%s\n", command); */ - execCommand(command); - - /* update history */ -#if 0 - free(historyCommand[0]); - for(pos = 0; pos < HISTORY_DEPTH - 1; pos++) - { - historyCommand[pos] = historyCommand[pos+1]; - /* printf("%s\n", historyCommand[pos]); */ - } - historyCommand[HISTORY_DEPTH - 1] = command; - historyPosition = HISTORY_DEPTH; -#endif - strcpy(currentCommand, ""); - gtk_entry_set_text(GTK_ENTRY(widget), (gchar *) ""); - propagateEvent = FALSE; - } - - -#if 0 - if(propagateEvent == FALSE) - { - /* I have to do this to stop gtk from propagating this event; - error in gtk? */ - event->keyval = (gchar) -173; - event->state = 0; - event->length = 0; - } -#endif - - return (propagateEvent == FALSE); -} - -static gint commandFocusOut_event(GtkWidget *widget, GdkEvent *event, gpointer data) -{ - /* - printf("focusOut\n"); - gtk_widget_grab_focus(GTK_WIDGET(widget)); - */ - return (TRUE); -} - -static gint activateCommandLine_signal(GtkWidget *widget, gpointer data) -{ - printf("focusIn\n"); - /* gtk_widget_grab_focus(GTK_WIDGET(entryCommand)); */ - - /* go on */ - return (FALSE); -} - -void initCommandEntry(void) -{ - GtkStyle *style; - GdkColor color; - - /* change style of command line to grey text on black ground */ - style = malloc(sizeof(GtkStyle)); - style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(applet))); - /* color = style->fg[GTK_STATE_NORMAL]; */ - /* style->text[GTK_STATE_NORMAL] = style->bg[GTK_STATE_NORMAL]; */ /* doesn't work; gtk? */ - /* style->fg[GTK_STATE_NORMAL] = style->bg[GTK_STATE_NORMAL]; - style->base[GTK_STATE_NORMAL] = color; */ - - style->fg[GTK_STATE_NORMAL].red = (gushort) prop.cmdLineColorFgR; - style->fg[GTK_STATE_NORMAL].green = (gushort) prop.cmdLineColorFgG; - style->fg[GTK_STATE_NORMAL].blue = (gushort) prop.cmdLineColorFgB; - - style->base[GTK_STATE_NORMAL].red = (gushort) prop.cmdLineColorBgR; - style->base[GTK_STATE_NORMAL].green = (gushort) prop.cmdLineColorBgG; - style->base[GTK_STATE_NORMAL].blue = (gushort) prop.cmdLineColorBgB; - - /* create the widget we are going to put on the applet */ - gtk_widget_push_style (style); - entryCommand = gtk_entry_new_with_max_length((guint16) MAX_COMMAND_LENGTH); - gtk_widget_pop_style (); - gtk_widget_set_usize(GTK_WIDGET(entryCommand), -1, prop.cmdLineY); - - - /* gtk_widget_set_style(GTK_WIDGET(entryCommand), style); */ - - /* gtk_signal_connect(GTK_OBJECT(entryCommand), "activate", - GTK_SIGNAL_FUNC(commandEntered_cb), - entryCommand); */ - gtk_signal_connect(GTK_OBJECT(entryCommand), "key_press_event", - GTK_SIGNAL_FUNC(commandKey_event), - NULL); - gtk_signal_connect(GTK_OBJECT(entryCommand), "focus_out_event", - GTK_SIGNAL_FUNC(commandFocusOut_event), - NULL); - -} diff --git a/mini-commander/exec.c b/mini-commander/exec.c deleted file mode 100644 index 042658199..000000000 --- a/mini-commander/exec.c +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Mini-Commander Applet - * Copyright (C) 1998 Oliver Maruhn <om@linuxhq.com> - * - * Author: Oliver Maruhn <om@linuxhq.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <string.h> -#include <config.h> -#include <gnome.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/wait.h> - -#include "exec.h" -#include "preferences.h" -#include "message.h" - -/* - These routines will only work on UNIX-alike system because fork() - is needed. Perhaps I will add an alternative for non UNIX system in - future (by using gnome-lib functions) -*/ - - -void execCommand(char *cmd) -{ - pid_t pid; - char *argv[10]; - char url[1000]; - char command[1000]; - char commandExec[1000]; - char macro[1000]; - char *substPtr; - int prefixRecognized = FALSE; - int i, j; - - /* make local copy of cmd; now we can minipulate command without - changing cmd (important for history) */ - strcpy(command, cmd); - - /* prefix used? */ - for(i=0; i<=MAX_PREFIXES-1; i++) - { - if (prop.prefix[i] != (char *) NULL && - strlen(prop.prefix[i]) > 0 && - strncmp(command, prop.prefix[i], strlen(prop.prefix[i])) == 0) - { - /* prefix recognized */ - prefixRecognized = TRUE; - strcpy(macro, prop.command[i]); - - if ((substPtr = strstr(macro, "$1")) != (char *) NULL) - { - /* "$1" found */ - *substPtr = '\000'; - strcpy(commandExec, macro); - strcat(commandExec, command + strlen(prop.prefix[i])); - strcat(commandExec, substPtr + 2); - } - else - { - /* no $1 in this macro */ - strcpy(commandExec, prop.command[i]); - } - - for(j=0; j<10; j++) - { - /* substitute up to ten $1's */ - strcpy(macro, commandExec); - if ((substPtr = strstr(macro, "$1")) != (char *) NULL) - { - /* "$1" found */ - *substPtr = '\000'; - strcpy(commandExec, macro); - strcat(commandExec, command + strlen(prop.prefix[i])); - strcat(commandExec, substPtr + 2); - } - } - - strcpy(command, commandExec); - } - } - - /* execute command */ - showMessage((gchar *) _("starting...")); - pid = gnome_execute_shell(NULL, command); -} - -static void sighandle(int sig) -{ - pid_t pid = 0; - int status; - - /* showMessage((gchar *) _("signal...")); */ - /*if (sig == SIGCHLD) */ - if (waitpid(0, &status, WNOHANG ) > 0) - showMessage((gchar *) _("child exited")); - signal(SIGCHLD, &sighandle); - return; -} - -void initExecSignalHandler(void) -{ - /* install signal handler */ - signal(SIGCHLD, &sighandle); -} |