← Back to branch summary

~ubuntu-branches/ubuntu/lucid/awn-extras-applets/lucid

« back to all changes in this revision

Viewing changes to applets/maintained/notification-daemon/engines.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-04-11 22:38:55 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100411223855-mamzuv887xyms08b
Tags: 0.4.0-0ubuntu1
https://launchpad.net/bugs/511256
https://launchpad.net/bugs/545164
https://launchpad.net/bugs/556175
https://launchpad.net/bugs/558463
https://launchpad.net/bugs/551119
https://launchpad.net/bugs/552376
* New upstream release.
 - Close cairo-menu after a click (LP: #511256)
 - Fix crash of awn-system-monitor (LP: #545164)
 - Fix crash when removing a volume >1 or adding volume >1 or using prefs
   while > 1 volumes is present (LP: #556175)
 - Fix crash of media-control when Rhythmbox quit (LP: #558463)
 - Fix crash of file-browser-launcher when there is no .gtk-bookmarks
   (LP: #551119)
* debian/awn-c-extras.install: 
 - Install icons and ini files for webapplets
* debian/awn-python-core.install:
 - Install ui file for comics (LP: #552376)
* debian/patches:
 - 03-remove-cairo-menu-pref.patch: Merged upstream.
 - 04-tomboy-threading-free.patch: Merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/maintained/notification-daemon/engines.c
756
756
  windata->body_label = gtk_label_new(NULL);
757
757
#else
758
758
  windata->body_label = sexy_url_label_new();
 
759
  g_signal_connect_swapped(G_OBJECT(windata->body_label), "url_activated",
 
760
                           G_CALLBACK(windata->url_clicked), win);
759
761
#endif
760
762
 
761
763
  gtk_box_pack_start(GTK_BOX(vbox), windata->body_label, TRUE, TRUE, 0);
764
766
 
765
767
  gtk_label_set_line_wrap(GTK_LABEL(windata->body_label), TRUE);
766
768
 
767
 
  g_signal_connect_swapped(G_OBJECT(windata->body_label), "url_activated",
768
 
                           G_CALLBACK(windata->url_clicked), win);
769
 
 
770
769
  atkobj = gtk_widget_get_accessible(windata->body_label);
771
770
 
772
771
  atk_object_set_description(atkobj, "Notification body text.");
1107
1106
    assert(1);
1108
1107
    x = x - WIDTH - 1;
1109
1108
 
1110
 
    if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
 
1109
    switch (awn_applet_get_pos_type(G_daemon_config.awn_app))
1111
1110
    {
1112
 
      y = y - nw->allocation.height - 1;
 
1111
      case GTK_POS_TOP:
 
1112
        if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
 
1113
        {
 
1114
          y = y + nw->allocation.height - 1;
 
1115
        }
 
1116
        break;
 
1117
      case GTK_POS_BOTTOM:
 
1118
        if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
 
1119
        {
 
1120
          y = y - nw->allocation.height - 1;
 
1121
        }
 
1122
        break;
1113
1123
    }
1114
1124
  }
1115
1125
  else if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
1116
1126
  {
1117
 
    assert(1);
1118
 
    y = y - nw->allocation.height - 1;
 
1127
    switch (awn_applet_get_pos_type(G_daemon_config.awn_app))
 
1128
    {
 
1129
      case GTK_POS_TOP:
 
1130
        if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
 
1131
        {
 
1132
          y = y + nw->allocation.height - 1;
 
1133
        }
 
1134
        break;
 
1135
      case GTK_POS_BOTTOM:
 
1136
        if (y + nw->allocation.height >= gdk_screen_get_height(gdk_screen_get_default()))
 
1137
        {
 
1138
          y = y - nw->allocation.height - 1;
 
1139
        }
 
1140
        break;
 
1141
    }
1119
1142
  }
1120
1143
 
1121
1144
  WindowData *windata = g_object_get_data(G_OBJECT(nw), "windata");