Don't display a dialog when the monitor is already running, that's an old

2005-11-27  Richard Hult  <richard@imendio.com>

	* main.c: (main): Don't display a dialog when the monitor is
	already running, that's an old remain from when drwright was a
	standalone app. Fixes bug #307425.

	* drw-break-window.c:
	* drwright.c: (popup_break_cb): Use stock icon from GTK+ instead
	of libgnomeui and use i18n includes from glib. Fixes bug #171664.
This commit is contained in:
Richard Hult 2005-11-27 12:30:11 +00:00 committed by Richard Hult
parent cb26efea4e
commit c06dae67d1
4 changed files with 27 additions and 28 deletions

View file

@ -21,10 +21,11 @@
#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <libgnomeui/libgnomeui.h>
#include <libgnome/gnome-i18n.h>
#include "drw-selection.h"
#include "drwright.h"
@ -85,30 +86,23 @@ main (int argc, char *argv[])
selection = drw_selection_start ();
if (!drw_selection_is_master (selection)) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
_("The typing monitor is already running."));
gtk_dialog_run (GTK_DIALOG (dialog));
g_message ("The typing monitor is already running, exiting.");
return 0;
}
if (!no_check && !have_tray ()) {
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
_("The typing monitor uses the notification area to display "
"information. You don't seem to have a notification area "
"on your panel. You can add it by right-clicking on your "
"panel and choosing 'Add to panel', selecting 'Notification "
"area' and clicking 'Add'."));
dialog = gtk_message_dialog_new (
NULL, 0,
GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
_("The typing monitor uses the notification area to display "
"information. You don't seem to have a notification area "
"on your panel. You can add it by right-clicking on your "
"panel and choosing 'Add to panel', selecting 'Notification "
"area' and clicking 'Add'."));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);