* [Bluez-devel] [PATCH] Remove unnecessary gtk_window_set_icon_name
@ 2007-12-21 22:30 Jaap A. Haitsma
2007-12-22 0:09 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: Jaap A. Haitsma @ 2007-12-21 22:30 UTC (permalink / raw)
To: BlueZ development
[-- Attachment #1: Type: text/plain, Size: 119 bytes --]
Hi,
We now use gtk_window_set_default_icon_name. So there's no need to
call gtk_window_set_icon_name every time
Jaap
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: bluez-gnome-gtk-window-set-icon-name-remove.patch --]
[-- Type: text/x-patch; name=bluez-gnome-gtk-window-set-icon-name-remove.patch, Size: 8474 bytes --]
Index: analyzer/dialog.c
===================================================================
RCS file: /cvsroot/bluez/gnome/analyzer/dialog.c,v
retrieving revision 1.20
diff -u -r1.20 dialog.c
--- analyzer/dialog.c 17 Dec 2007 01:41:19 -0000 1.20
+++ analyzer/dialog.c 21 Dec 2007 22:26:41 -0000
@@ -44,8 +44,6 @@
dialog = gtk_message_dialog_new_with_markup(NULL, GTK_DIALOG_MODAL,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, message);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
@@ -70,8 +68,6 @@
gtk_window_set_position(GTK_WINDOW(dialog),
GTK_WIN_POS_CENTER_ON_PARENT);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog),
_("Bluetooth Analyzer"));
@@ -307,8 +303,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
@@ -351,8 +345,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(dialog), TRUE);
gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
@@ -477,8 +469,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT);
@@ -523,8 +513,6 @@
g_free(text);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_add_button(GTK_DIALOG(dialog), _("Close _without Saving"),
GTK_RESPONSE_CLOSE);
@@ -565,8 +553,6 @@
g_free(text);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
Index: analyzer/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/analyzer/main.c,v
retrieving revision 1.35
diff -u -r1.35 main.c
--- analyzer/main.c 17 Dec 2007 19:02:22 -0000 1.35
+++ analyzer/main.c 21 Dec 2007 22:26:42 -0000
@@ -840,7 +840,6 @@
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Bluetooth Analyzer"));
- gtk_window_set_icon_name(GTK_WINDOW(window), "stock_bluetooth");
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_default_size(GTK_WINDOW(window), 850, 650);
g_signal_connect(G_OBJECT(window), "delete-event",
Index: applet/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/applet/main.c,v
retrieving revision 1.94
diff -u -r1.94 main.c
--- applet/main.c 19 Dec 2007 01:06:05 -0000 1.94
+++ applet/main.c 21 Dec 2007 22:26:42 -0000
@@ -281,8 +281,6 @@
gtk_window_set_title(GTK_WINDOW(dialog), _("Authentication request"));
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
@@ -418,8 +416,6 @@
gtk_window_set_title(GTK_WINDOW(dialog), _("Confirmation request"));
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
@@ -540,8 +536,6 @@
gtk_window_set_title(GTK_WINDOW(dialog), _("Authorization request"));
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
@@ -1528,8 +1522,6 @@
dialog = gtk_about_dialog_new();
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog),
_("Bluetooth Applet"));
@@ -1621,8 +1613,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT, FALSE);
Index: properties/dialog.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/dialog.c,v
retrieving revision 1.8
diff -u -r1.8 dialog.c
--- properties/dialog.c 29 Aug 2007 12:44:05 -0000 1.8
+++ properties/dialog.c 21 Dec 2007 22:26:42 -0000
@@ -54,8 +54,6 @@
g_free(text);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
@@ -88,8 +86,6 @@
g_free(text);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
@@ -303,8 +299,6 @@
dialog = gtk_dialog_new_with_buttons(_("Create Device"), NULL,
GTK_DIALOG_NO_SEPARATOR, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
GTK_RESPONSE_APPLY);
Index: properties/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/properties/main.c,v
retrieving revision 1.50
diff -u -r1.50 main.c
--- properties/main.c 18 Dec 2007 19:56:58 -0000 1.50
+++ properties/main.c 21 Dec 2007 22:26:42 -0000
@@ -72,7 +72,6 @@
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Bluetooth Preferences"));
- gtk_window_set_icon_name(GTK_WINDOW(window), "stock_bluetooth");
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
g_signal_connect(G_OBJECT(window), "delete-event",
G_CALLBACK(delete_callback), NULL);
Index: proximity/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/proximity/main.c,v
retrieving revision 1.26
diff -u -r1.26 main.c
--- proximity/main.c 17 Dec 2007 19:02:22 -0000 1.26
+++ proximity/main.c 21 Dec 2007 22:26:44 -0000
@@ -228,8 +228,6 @@
gtk_window_set_title(GTK_WINDOW(window), "Bluetooth proximity");
- gtk_window_set_icon_name(GTK_WINDOW(window), "stock_bluetooth");
-
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_default_size(GTK_WINDOW(window), 480, 360);
Index: sendto/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/sendto/main.c,v
retrieving revision 1.10
diff -u -r1.10 main.c
--- sendto/main.c 17 Dec 2007 19:02:22 -0000 1.10
+++ sendto/main.c 21 Dec 2007 22:26:44 -0000
@@ -54,8 +54,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
@@ -84,8 +82,6 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_CONNECT, GTK_RESPONSE_ACCEPT, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
-
gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT, FALSE);
@@ -128,7 +124,6 @@
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
- gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
gtk_window_set_default_size(GTK_WINDOW(dialog), 400, -1);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
Index: wizard/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/wizard/main.c,v
retrieving revision 1.25
diff -u -r1.25 main.c
--- wizard/main.c 18 Dec 2007 19:56:59 -0000 1.25
+++ wizard/main.c 21 Dec 2007 22:26:44 -0000
@@ -398,8 +398,6 @@
gtk_window_set_title(GTK_WINDOW(assistant), _("Bluetooth Device Wizard"));
- gtk_window_set_icon_name(GTK_WINDOW(assistant), "stock_bluetooth");
-
gtk_window_set_position(GTK_WINDOW(assistant), GTK_WIN_POS_CENTER);
gtk_window_set_default_size(GTK_WINDOW(assistant), 440, 440);
[-- Attachment #3: Type: text/plain, Size: 228 bytes --]
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
[-- Attachment #4: Type: text/plain, Size: 164 bytes --]
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Bluez-devel] [PATCH] Remove unnecessary gtk_window_set_icon_name
2007-12-21 22:30 [Bluez-devel] [PATCH] Remove unnecessary gtk_window_set_icon_name Jaap A. Haitsma
@ 2007-12-22 0:09 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2007-12-22 0:09 UTC (permalink / raw)
To: BlueZ development
Hi Jaap,
> We now use gtk_window_set_default_icon_name. So there's no need to
> call gtk_window_set_icon_name every time
patch has been committed to the CVS. Thanks.
Regards
Marcel
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-22 0:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-21 22:30 [Bluez-devel] [PATCH] Remove unnecessary gtk_window_set_icon_name Jaap A. Haitsma
2007-12-22 0:09 ` Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox