Mon, 11 Apr 2005 12:24:47 +0000
[gaim-migrate @ 12468]
same thing here, changing to consistently using GTK+, by rlaager
--- a/HACKING Mon Apr 11 12:11:11 2005 +0000 +++ b/HACKING Mon Apr 11 12:24:47 2005 +0000 @@ -18,7 +18,7 @@ If you don't know how event-driven programs work, stop right now. Gaim uses GTK+'s main loop (actually GLib's but I won't talk about how GTK works) and uses GLib functions for timeouts and socket notification. If -you don't know GTK you should go learn that first. +you don't know GTK+ you should go learn that first. If you're going to hack gaim, PLEASE, PLEASE PLEASE PLEASE send patches against the absolute latest CVS. I get really annoyed when I get patches @@ -131,8 +131,8 @@ mostly drawing the window. show_conv is the best place to edit the UI. That's pretty much it for the quick tutorial. I know it wasn't much but -it's enough to get you started. Make sure you know GTK before you get too -involved. Most of the back-end stuff is pretty basic; most of gaim is GTK. +it's enough to get you started. Make sure you know GTK+ before you get too +involved. Most of the back-end stuff is pretty basic; most of gaim is GTK+. SOURCE FILES (this should probly be utterly removed) @@ -256,7 +256,7 @@ like the name says. plugins/ticker/gtkticker.c: - Syd, our resident GTK God, wrote a GtkWidget, GtkTicker. This is that + Syd, our resident GTK+ God, wrote a GtkWidget, GtkTicker. This is that widget. It's cool, and it's tiny. This is actually a really good example widget for those of you looking to write your own. @@ -426,14 +426,14 @@ because without it, Gaim will most likely segfault. The second most important function is login(). Not all functions need to be implemented. -There should be absolutely *ZERO* GTK in the PRPLs. PRPLs should *NEVER* +There should be absolutely *ZERO* GTK+ in the PRPLs. PRPLs should *NEVER* say what the UI *looks* like, only what information needs to be there. -There's currently an effort to get the GTK that is contained in the PRPLs -directory out of there. If you submit a patch that adds GTK to those +There's currently an effort to get the GTK+ that is contained in the PRPLs +directory out of there. If you submit a patch that adds GTK+ to those directories it's very likely to be refused, unless if I'm in a good mood and decide to relocate things for you. That's not likely. -You're probably wondering how you can do certain things without GTK. Well, +You're probably wondering how you can do certain things without GTK+. Well, you're just going to have to make do. Rely on the UI, that's why it's there. A PRPL should have absolutely ZERO interaction with the user, it should all be handled by the UI.
--- a/configure.ac Mon Apr 11 12:11:11 2005 +0000 +++ b/configure.ac Mon Apr 11 12:24:47 2005 +0000 @@ -1218,7 +1218,7 @@ echo Protocols to link statically.. : $STATIC_PRPLS echo Protocols to build dynamically : $DYNAMIC_PRPLS echo -echo UI Library.................... : GTK 2.x +echo UI Library.................... : GTK+ 2.x echo SSL Library/Libraries......... : $msg_ssl echo echo Build with Plugin support..... : $enable_plugins
--- a/doc/FAQ Mon Apr 11 12:11:11 2005 +0000 +++ b/doc/FAQ Mon Apr 11 12:24:47 2005 +0000 @@ -13,7 +13,7 @@ still using the old version. 1.7. Are the packages signed? If so, by who, and how can I get the key? - 1.8. Can I use Gaim for GTK+1.2? + 1.8. Can I use Gaim for GTK+ 1.2? 1.9. Can I run Gaim on IRIX? 1.10. Can I run gaim on MacOSX? 1.11. How do I apply the patch "something.diff"? @@ -422,7 +422,7 @@ On Windows, this file is located at C:\Documents and Settings\username \.themes\Default\gtk-2.0\gtkrc. - You can also just switch to a different GTK theme. You can find GTK themes + You can also just switch to a different GTK+ theme. You can find GTK+ themes (and information on using them) by visiting themes.freshmeat.net, art.gnome.org, or searching on Google. @@ -517,7 +517,7 @@ client has multiple windows with identical WM_CLASS and WM_NAME properties, then it should provide a WM_WINDOW_ROLE property." - Gtk+ sets these WM_CLASS values for us so that they are unique for Gaim + GTK+ sets these WM_CLASS values for us so that they are unique for Gaim instances, and the documentation for the gtk_window_set_wmclass function says explicitly not to use it for anything else. Gaim uses the WM_WINDOW_ROLE hint to differentiate windows. If your window manager is having problems
--- a/doc/PERL-HOWTO.dox Mon Apr 11 12:11:11 2005 +0000 +++ b/doc/PERL-HOWTO.dox Mon Apr 11 12:24:47 2005 +0000 @@ -12,7 +12,7 @@ plugin, and appears in the list of plugins in Gaim's preferences pane. Until now, they have been very basic, and consisted of only a few functions. However, with the latest changes to Gaim's perl API, a much - larger part of Gaim is now open. In time, even such things as Gtk+ + larger part of Gaim is now open. In time, even such things as GTK+ preference panes for perl scripts will be possible. @section first-script Writing your first perl script @@ -62,7 +62,7 @@ The first thing you see is a hash called @c @%PLUGIN_INFO. It contains the basic information on your plugin. In the future, additional fields - may be allowed, such as ones to setup a Gtk+ preferences pane. + may be allowed, such as ones to setup a GTK+ preferences pane. The @c plugin_init function is required in all perl scripts. Its job is to return the @c @%PLUGIN_INFO hash, which Gaim will use to register
--- a/gaim-installer.nsi Mon Apr 11 12:11:11 2005 +0000 +++ b/gaim-installer.nsi Mon Apr 11 12:24:47 2005 +0000 @@ -925,8 +925,8 @@ ; 0 - We have the correct version ; Second Pop: Key where Version was found ; 1 - We have an old version that needs to be upgraded -; Second Pop: HKLM or HKCU depending on where GTK was found. -; 2 - We don't have Gtk+ at all +; Second Pop: HKLM or HKCU depending on where GTK+ was found. +; 2 - We don't have GTK+ at all ; Second Pop: "NONE, HKLM or HKCU" depending on our rights.. ; Function DoWeNeedGtk @@ -1031,7 +1031,7 @@ StrCpy $GTK_THEME_SEL ${SecGtkWimp} StrCpy $ISSILENT "/NOUI" - ; GTK installer has two silent states.. one with Message boxes, one without + ; GTK+ installer has two silent states.. one with Message boxes, one without ; If gaim installer was run silently, we want to supress gtk installer msg boxes. IfSilent 0 set_gtk_normal StrCpy $ISSILENT "/S"
--- a/gaim.spec.in Mon Apr 11 12:11:11 2005 +0000 +++ b/gaim.spec.in Mon Apr 11 12:24:47 2005 +0000 @@ -1,4 +1,4 @@ -Summary: A Gtk+ based multiprotocol instant messaging client +Summary: A GTK+ based multiprotocol instant messaging client Name: @PACKAGE@ Version: @VERSION@ Release: 0
--- a/plugins/gaimrc.c Mon Apr 11 12:11:11 2005 +0000 +++ b/plugins/gaimrc.c Mon Apr 11 12:24:47 2005 +0000 @@ -340,7 +340,7 @@ hbox = gtk_hbox_new(FALSE, 18); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); - check = gaim_gtk_prefs_checkbox(_("Gtk interface font"), + check = gaim_gtk_prefs_checkbox(_("GTK+ Interface Font"), "/plugins/gtk/gaimrc/set/gtk-font-name", hbox); gtk_size_group_add_widget(sg, check); @@ -359,7 +359,7 @@ hbox = gtk_hbox_new(FALSE, 18); gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0); - check = gaim_gtk_prefs_checkbox(_("Gtk text shortcut theme"), + check = gaim_gtk_prefs_checkbox(_("GTK+ Text Shortcut Theme"), "/plugins/gtk/gaimrc/set/gtk-key-theme-name", hbox); gtk_size_group_add_widget(sg, check);
--- a/plugins/gestures/stroke-draw.c Mon Apr 11 12:11:11 2005 +0000 +++ b/plugins/gestures/stroke-draw.c Mon Apr 11 12:24:47 2005 +0000 @@ -319,7 +319,7 @@ } -/* This function should be written using Gtk+ primitives*/ +/* This function should be written using GTK+ primitives*/ static void gstroke_invisible_window_init (GtkWidget *widget) {
--- a/po/am.po Mon Apr 11 12:11:11 2005 +0000 +++ b/po/am.po Mon Apr 11 12:24:47 2005 +0000 @@ -2998,7 +2998,7 @@ msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " -"at once. It is written using Gtk+ and is licensed under the GPL.<BR><BR>" +"at once. It is written using GTK+ and is licensed under the GPL.<BR><BR>" msgstr "" #: src/gtkdialogs.c:217
--- a/po/bg.po Mon Apr 11 12:11:11 2005 +0000 +++ b/po/bg.po Mon Apr 11 12:24:47 2005 +0000 @@ -3096,10 +3096,10 @@ msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " -"at once. It is written using Gtk+ and is licensed under the GPL.<BR><BR>" +"at once. It is written using GTK+ and is licensed under the GPL.<BR><BR>" msgstr "" "Gaim клиент за изпращане на съобщения чрез·AIM,·ICQ,·Yahoo!,·MSN,·IRC," -"·Jabber,·Napster,·Zephyr,·и·Gadu-Gadu.Написан е чрез·Gtk+·и е лицензиран " +"·Jabber,·Napster,·Zephyr,·и·Gadu-Gadu.Написан е чрез·GTK+·и е лицензиран " "под·GPL.<BR><BR>" #: src/gtkdialogs.c:217
--- a/po/ca.po Mon Apr 11 12:11:11 2005 +0000 +++ b/po/ca.po Mon Apr 11 12:24:47 2005 +0000 @@ -3186,11 +3186,11 @@ msgid "" "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, " "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all " -"at once. It is written using Gtk+ and is licensed under the GPL.<BR><BR>" +"at once. It is written using GTK+ and is licensed under the GPL.<BR><BR>" msgstr "" "Gaim és un client modular de missatges instantanis capaç d'usar AIM, MSN, " "Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-" -"Gadu, tots alhora. Està escrit usant Gtk+ i roman sota llicència GPL.<BR><BR>" +"Gadu, tots alhora. Està escrit usant GTK+ i roman sota llicència GPL.<BR><BR>" #: src/gtkdialogs.c:248 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"