← Back to branch summary

~ubuntu-branches/ubuntu/karmic/pidgin/karmic

« back to all changes in this revision

Viewing changes to pidgin/gtkimhtml.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-02-23 18:30:20 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090223183020-jmne1l61866atkd8
Tags: 1:2.5.4-2ubuntu1
https://launchpad.net/bugs/316636
* Merge from debian, remaining changes: (LP: #316636)
  - debian/control:
    + Add Build-Deps on liblaunchpad-integration-dev, intltool,
    network-manager-dev
    + Add epoch in dependencies
    + Drop the libpurple0 dependency on libpurple-bin
  - debian/libpurple0.symbols: add epoch to symbol
  - debian/pidgin-dbg.preinst, debian/pidgin-dev.preinst,
    debian/pidgin.preinst: add epoch
  - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/*, set /pidgin/plugins/loaded to load
    the notify plugin and enable the standard logging options by default
  - debian/rules:
    + remove --disable-nm as nm has been fixed in Ubuntu
    + Add X-Ubuntu-Gettext-Domain to the desktop file and update the
      translation templates in common-install-impl::
  - debian/patches:
    + 02_lpi.patch for LP integration
    + 04_let_crasher_for_apport.patch to stop catching the SIGSEGV signal
      and let apport handle it
    + 05_default_to_irc_ubuntu_com.patch to set the default IRC
      server to irc.ubuntu.com
    + 70_autoconf.patch
    + fix-icons-backport-from-2.5.5mtn.diff:
      Fix to see buddy icons for new Windows Live users.
      The patch will be included in pidgin-2.5.5 

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkimhtml.c
3117
3117
                                                        else if (g_ascii_strcasecmp(size, "smaller") == 0
3118
3118
                                                                  || g_ascii_strcasecmp(size, "x-small") == 0)
3119
3119
                                                                font->size = 2;
3120
 
                                                        else if (g_ascii_strcasecmp(size, "larger") == 0
3121
 
                                                                  || g_ascii_strcasecmp(size, "medium") == 0)
 
3120
                                                        else if (g_ascii_strcasecmp(size, "medium") == 0)
 
3121
                                                                font->size = 3;
 
3122
                                                        else if (g_ascii_strcasecmp(size, "large") == 0
 
3123
                                                                  || g_ascii_strcasecmp(size, "larger") == 0)
3122
3124
                                                                font->size = 4;
3123
 
                                                        else if (g_ascii_strcasecmp(size, "large") == 0)
 
3125
                                                        else if (g_ascii_strcasecmp(size, "x-large") == 0)
3124
3126
                                                                font->size = 5;
3125
 
                                                        else if (g_ascii_strcasecmp(size, "x-large") == 0)
 
3127
                                                        else if (g_ascii_strcasecmp(size, "xx-large") == 0)
3126
3128
                                                                font->size = 6;
3127
 
                                                        else if (g_ascii_strcasecmp(size, "xx-large") == 0)
3128
 
                                                                font->size = 7;
3129
3129
 
3130
3130
                                                        /*
3131
3131
                                                         * TODO: Handle other values, like percentages, or