Menu
▾
▴
[Gaim-commits] CVS: gaim/src browser.c,1.30,1.31 buddy.c,1.336,1.337 conversation.c,1.381,1.382 dialogs.c,1.341,1.342 gaim.h,1.338,1.339 multi.c,1.129,1.130 ui.h,1.57,1.58
|
From: Sean E. <sea...@us...> - 2002-09-26 15:23:36
|
Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv7945/src
Modified Files:
browser.c buddy.c conversation.c dialogs.c gaim.h multi.c ui.h
Log Message:
A long annoying patch by one Robert McQueen.
Index: browser.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/browser.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- browser.c 29 Aug 2002 21:40:06 -0000 1.30
+++ browser.c 26 Sep 2002 15:23:32 -0000 1.31
@@ -490,7 +490,7 @@
mozilla_remote_init_atoms();
window = mozilla_remote_find_window();
- if (window && (((GdkWindowPrivate *) window)->destroyed == FALSE)) {
+ if (window && (GDK_WINDOW_OBJECT(window)->destroyed == FALSE)) {
XSelectInput(gdk_display, GDK_WINDOW_XWINDOW(window),
(PropertyChangeMask | StructureNotifyMask));
@@ -528,7 +528,7 @@
mozilla_remote_init_atoms();
window = mozilla_remote_find_window();
- if (window && (((GdkWindowPrivate *) window)->destroyed == FALSE)) {
+ if (window && (GDK_WINDOW_OBJECT(window)->destroyed == FALSE)) {
XSelectInput(gdk_display, GDK_WINDOW_XWINDOW(window),
(PropertyChangeMask | StructureNotifyMask));
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- buddy.c 26 Sep 2002 07:37:51 -0000 1.336
+++ buddy.c 26 Sep 2002 15:23:32 -0000 1.337
@@ -1999,7 +1999,7 @@
buddy list/login window--depending on which is active */
if (connections) {
if (GTK_WIDGET_VISIBLE(blist)) {
- if (DOCKLET_WINDOW_ICONIFIED(blist)) {
+ if (GAIM_WINDOW_ICONIFIED(blist)) {
unhide_buddy_list();
} else {
hide_buddy_list();
@@ -2009,7 +2009,7 @@
}
} else {
if (GTK_WIDGET_VISIBLE(mainwindow)) {
- if (DOCKLET_WINDOW_ICONIFIED(mainwindow)) {
+ if (GAIM_WINDOW_ICONIFIED(mainwindow)) {
gtk_window_present(GTK_WINDOW(mainwindow));
} else {
gtk_widget_hide(mainwindow);
@@ -2458,6 +2458,13 @@
}
}
+static void change_state_blist_window(GtkWidget *w, GdkEventWindowState *event, void *dummy) {
+ if (event->new_window_state & GDK_WINDOW_STATE_ICONIFIED &&
+ docklet_count) {
+ gtk_widget_hide(blist);
+ }
+}
+
/*******************************************************************
*
* Helper funs for making the menu
@@ -2493,8 +2500,7 @@
gtk_widget_add_accelerator(menuitem, "activate", accel, str[0],
GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
- gtk_widget_lock_accelerators(menuitem);
-
+
return menuitem;
}
@@ -2544,7 +2550,6 @@
if (accel_key) {
gtk_widget_add_accelerator(menuitem, "activate", accel, accel_key,
accel_mods, GTK_ACCEL_LOCKED);
- gtk_widget_lock_accelerators(menuitem);
}
return menuitem;
@@ -2656,7 +2661,7 @@
gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE);
accel = gtk_accel_group_new();
- gtk_accel_group_attach(accel, G_OBJECT(blist));
+ gtk_window_add_accel_group(G_OBJECT(blist), accel);
menubar = gtk_menu_bar_new();
@@ -2866,6 +2871,8 @@
NULL);
gtk_signal_connect(GTK_OBJECT(blist), "configure_event", GTK_SIGNAL_FUNC(configure_blist_window),
+ NULL);
+ gtk_signal_connect(GTK_OBJECT(blist), "window_state_event", GTK_SIGNAL_FUNC(change_state_blist_window),
NULL);
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- conversation.c 25 Sep 2002 13:19:44 -0000 1.381
+++ conversation.c 26 Sep 2002 15:23:33 -0000 1.382
@@ -2118,7 +2118,7 @@
GtkWidget *win;
GtkWidget *entry;
- toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ toolbar = gtk_toolbar_new();
win = c->window;
entry = c->entry;
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- dialogs.c 23 Sep 2002 14:58:06 -0000 1.341
+++ dialogs.c 26 Sep 2002 15:23:33 -0000 1.342
@@ -3692,7 +3692,7 @@
/* pack buttons */
if (c->gc->prpl->smiley_list == NULL) {
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
toolbar_add_smiley(c, smiley_box, angel_xpm, win, "O:-)");
@@ -3700,7 +3700,7 @@
toolbar_add_smiley(c, smiley_box, burp_xpm, win, ":-!");
toolbar_add_smiley(c, smiley_box, crossedlips_xpm, win, ":-X");
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
toolbar_add_smiley(c, smiley_box, cry_xpm, win, ":'(");
@@ -3708,7 +3708,7 @@
toolbar_add_smiley(c, smiley_box, kiss_xpm, win, ":-*");
toolbar_add_smiley(c, smiley_box, moneymouth_xpm, win, ":-$");
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
toolbar_add_smiley(c, smiley_box, sad_xpm, win, ":-(");
@@ -3716,7 +3716,7 @@
toolbar_add_smiley(c, smiley_box, smile_xpm, win, ":-)");
toolbar_add_smiley(c, smiley_box, smile8_xpm, win, "8-)");
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
toolbar_add_smiley(c, smiley_box, think_xpm, win, ":-/");
@@ -3740,7 +3740,7 @@
smilies = c->gc->prpl->smiley_list();
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
while (smilies) {
@@ -3750,7 +3750,7 @@
if (smile->show) {
if ((!(smiley_count % ((int)(sqrt(total_count))))) && (smiley_count > 0)) {
- smiley_box = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
+ smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
}
Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- gaim.h 17 Sep 2002 02:56:40 -0000 1.338
+++ gaim.h 26 Sep 2002 15:23:33 -0000 1.339
@@ -353,7 +353,6 @@
extern void do_pounce(struct gaim_connection *, char *, int);
void create_prpl_icon(GtkWidget *widget, struct gaim_connection *gc,
GdkPixmap **pixmap, GdkBitmap **mask);
-void docklet_toggle();
/* Functions in buddy_chat.c */
extern void show_new_buddy_chat(struct conversation *);
Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- multi.c 16 Sep 2002 08:35:23 -0000 1.129
+++ multi.c 26 Sep 2002 15:23:33 -0000 1.130
@@ -1112,7 +1112,7 @@
gtk_widget_destroy(meter_win->window);
g_free (meter_win);
meter_win = NULL;
- }
+ }
}
void account_online(struct gaim_connection *gc)
@@ -1130,22 +1130,6 @@
/* then we do the buddy list stuff */
if (mainwindow)
gtk_widget_hide(mainwindow);
-
-/* fixme: docklet
- if (blist_options & OPT_BLIST_APP_BUDDY_SHOW) {
- show_buddy_list();
- refresh_buddy_window();
- createOnlinePopup();
- applet_buddy_show = TRUE;
- } else if (!blist) {
- show_buddy_list();
- build_edit_tree();
- gtk_widget_hide(blist);
- applet_buddy_show = FALSE;
- } else {
- build_edit_tree();
- }
- set_user_state(online); */
show_buddy_list();
refresh_buddy_window();
Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- ui.h 23 Sep 2002 03:31:02 -0000 1.57
+++ ui.h 26 Sep 2002 15:23:33 -0000 1.58
@@ -31,12 +31,8 @@
#define GAIM_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
-#define GdkWindowPrivate GdkWindowObject
-#define gtk_toolbar_new(x,y) gtk_toolbar_new()
-#define gtk_accel_group_attach(x, y) _gtk_accel_group_attach(x, y)
-#define gtk_widget_lock_accelerators(x)
-#define DOCKLET_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
+#define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
#define DEFAULT_FONT_FACE "Helvetica"
|
