isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

include locale.h, fix from Hidetoshi Tajima

Browse Source 
2002-05-11  Havoc Pennington  <hp@pobox.com>

	* src/main.c: include locale.h, fix from Hidetoshi Tajima

	* src/window.c (meta_window_new): disable show desktop mode when a
	new window is managed.
This commit is contained in:
Havoc Pennington 2002-05-11 05:47:04 +00:00 committed by Havoc Pennington
parent a3460b8ac8
commit 41e99288b5
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-05-11 Havoc Pennington <hp@pobox.com>
* src/main.c: include locale.h, fix from Hidetoshi Tajima
* src/window.c (meta_window_new): disable show desktop mode when a
new window is managed.
2002-05-11 Havoc Pennington <hp@pobox.com> 2002-05-11 Havoc Pennington <hp@pobox.com>
* src/fixedtip.c (meta_fixed_tip_show): keep the tooltip * src/fixedtip.c (meta_fixed_tip_show): keep the tooltip

1
src/main.c
View File

@ -38,6 +38,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <locale.h>
static MetaExitCode meta_exit_code = META_EXIT_SUCCESS; static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;
static GMainLoop *meta_main_loop = NULL; static GMainLoop *meta_main_loop = NULL;

22
src/tools/metacity-window-demo.c
View File

@ -332,6 +332,28 @@ override_redirect_cb (gpointer callback_data,
gtk_widget_show_all (window); gtk_widget_show_all (window);
} }
static void
changing_icon_cb (gpointer callback_data,
guint callback_action,
GtkWidget *widget)
{
GtkWidget *window;
GtkWidget *vbox;
GtkWidget *label;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "Changing Icon");
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
label = gtk_label_new ("This window has an icon that changes over time");
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show_all (window);
}
static gboolean static gboolean
focus_in_event_cb (GtkWidget *window, focus_in_event_cb (GtkWidget *window,
GdkEvent *event, GdkEvent *event,

6
src/window.c
View File

@ -673,6 +673,12 @@ meta_window_new (MetaDisplay *display, Window xwindow,
/* Sync stack changes */ /* Sync stack changes */
meta_stack_thaw (window->screen->stack); meta_stack_thaw (window->screen->stack);
/* disable show desktop mode unless we're a desktop component */
if (window->display->showing_desktop &&
window->type != META_WINDOW_DESKTOP &&
window->type != META_WINDOW_DOCK)
meta_display_unshow_desktop (window->display);
meta_window_queue_calc_showing (window); meta_window_queue_calc_showing (window);
meta_display_ungrab (display); meta_display_ungrab (display);