Merge lp:~ilkka/gwibber/gtk-find-icon-loading-fix into lp:~gwibber-committers/gwibber/trunk.merge.backup

[Ilkka Laukkanen]

[Ilkka Laukkanen (ilkka)]

I changed the populate_tree() and add_search() methods in gwibber/gwui.py to call gtk.IconTheme.lookup_icon() on the default theme directly when trying to load the "gtk-find" icon, passing the gtk.ICON_LOOKUP_USE_BUILTIN flag. This gets them the correct icon, but since it's a builtin it doesn't have a filename and gtk.gdk.pixbuf_new_from_file() can't be used, instead I call get_builtin_pixbuf() on the icon and set "icon" to that.

[lp:~ilkka/gwibber/gtk-find-icon-loading-fix]

408. By Ken VanDine on 2009-09-14

Added a dbus interface for the client, so external events can raise the gwibber window

409. By Ken VanDine on 2009-09-14

Added some convience scripts:
 * scripts/gwibber-client-raise:
   - uses dbus-send to raise the client window
 * scripts/gwibber-daemon-shutdown:
   - uses dbus-send to shutdown the backend

410. By Ken VanDine on 2009-09-14

Added com.Gwibber.Client.service to start the client

411. By Ken VanDine on 2009-09-14

Added com.Gwibber.Client.service to MANIFEST.in

412. By Ken VanDine on 2009-09-15

Updated the indicator references to match libindicate v3

413. By Ken VanDine on 2009-09-15

* split out self.on_indicator_reply_activate and self.on_indicator_activate.
* added some debugging statements

414. By Ken VanDine on 2009-09-15

rename com.Gwibber.Client to com.GwibberClient

415. By Ken VanDine on 2009-09-15

return success and fail from client operations

416. By Ken VanDine on 2009-09-15

More renaming com.gwibber.Client to com.GwibberClient

417. By Ken VanDine on 2009-09-15

Renamed back to com.Gwibber.Client

418. By Ken VanDine on 2009-09-15

Removed debugging statements

419. By Ken VanDine on 2009-09-15

more renaming

420. By Ken VanDine on 2009-09-15

fixed typo

421. By Ken VanDine on 2009-09-16

Clean up

422. By Ken VanDine on 2009-09-16

added import for print_exc

423. By Ken VanDine on 2009-09-16

Make dbus calls async so we don't block the daemon and rename back to GwibberClient to prevent fighting over ownership.

424. By Ken VanDine on 2009-09-16

rename back to GwibberClient to prevent fighting over ownership.

425. By Ken VanDine on 2009-09-16

Don't check for allow_multiple_instances setting, we don't provide a way to set it anymore. Also we can't use dbus to check for a running client before starting a client, checking will start the client itself.

426. By Ken VanDine on 2009-09-16

show_replies now selects "Replies" and focus_client now select "Messages"

427. By Ken VanDine on 2009-09-16

Support both libindicate1 and libindicate3 versions of python-indicate

428. By Ken VanDine on 2009-09-18

  Ryan Paul 2009-09-16 Convert regex matches to bool values for D-Bus
  Ryan Paul 2009-09-12 If selected theme or url shortener are unavailable, automatically reset to defaults

429. By Ken VanDine on 2009-09-18

don't install the indicator launcher, we will do that in the packaging

430. By Ken VanDine on 2009-09-18

Reverted last commit, we'll include the indicator

431. By Ken VanDine on 2009-09-18

Actually mark replies read :)

432. By Ken VanDine on 2009-09-19

* Added dbus methods to the client for operation_started and operation_finished
  - To be used for starting/stopping throbber
* Added a dbus method to the client that lists exposed methods
* Added scripts/gwibber-client
  - shell script that takes one argument, and calls the gwibber client
    dbus with that name
  - To get a list of methods, ./scripts/gwibber-client list

433. By Ken VanDine on 2009-09-19

removed scripts/gwibber-client-raise

434. By Ryan Paul on 2009-09-20

Override desktop setting for menu icon visibility on the accounts menu and for the spinner

435. By Ken VanDine on 2009-09-21

* Removed the operation_started and operation_finished dbus methods
* Fixed started and stopping of the throbber while performing operations

436. By Ken VanDine on 2009-09-21

Really fix 421655 (displaying the throbber)

437. By Ryan Paul on 2009-09-21

Added support for viewing errors in Gwibber

438. By Ryan Paul on 2009-09-21

Display the source attribute in Twitter and Identi.ca posts

439. By Ken VanDine on 2009-09-22

added notifications to server.py and switch to pynotify

440. By Ken VanDine on 2009-09-23

more notification work, left some DEBUG statements in

441. By Ken VanDine on 2009-09-24

Removed debugging statement

442. By Ken VanDine on 2009-09-24

don't set icon = None for the notification

443. By Ken VanDine on 2009-09-24

use the gwibber icon for the notification for now, and check gwibber_id for message dupes

444. By Ken VanDine on 2009-09-24

use mx.DateTime to convert time to localtime for the indicator

445. By Ken VanDine on 2009-09-24

Updated credits

446. By Ken VanDine on 2009-09-24

Removed actions from notifications, we don't have a way to act on them anyway

447. By Ken VanDine on 2009-09-24

Merged patch from James Ogley fixing retweets (LP: #423026)

448. By Ken VanDine on 2009-09-24

fix patch for indicator launcher

449. By Ken VanDine on 2009-09-24

move the source for the indicator launcher to the indicator subdir

450. By Ryan Paul on 2009-09-25

Fixed theme switching and introduced new default theme

451. By Ryan Paul on 2009-09-25

Make combobox stream switcher work. Fix other stream sync issues

452. By Ryan Paul on 2009-09-25

Add defaultcss.mako

453. By Ken VanDine on 2009-09-25

Merged size-and-position-fixes.patch from Sandy Armstrong fixes lp:421688 lp:422532 lp:422525

454. By Ryan Paul on 2009-09-25

Fixed the errror templates in default and compact themes

455. By Ken VanDine on 2009-09-25

Version themes to ensure compatibilty

456. By Ken VanDine on 2009-09-27

fix dict handling for facebook replies

457. By Ryan Paul on 2009-10-01

Only shrink profile icons in the compact theme

458. By Ken VanDine on 2009-10-04

dbus mainloop, trying to make things more robust

459. By Ken VanDine on 2009-10-04

Make our dbus proxy objects follow name changes, thus a bit more robust

460. By Ken VanDine on 2009-10-04

Added logging if there are no scheduled operations

461. By Ken VanDine on 2009-10-04

  Ryan Paul 2009-09-30 Remove placeholder for Favorites

462. By Ryan Paul on 2009-10-04

Use PyCurl instead of urllib2 for Facebook

463. By Ken VanDine on 2009-10-05

Don't set introspect to false

464. By Ken VanDine on 2009-10-05

dropped import for urllib2

465. By Ken VanDine on 2009-10-05

Fixed theme installs

466. By Ken VanDine on 2009-10-10

Fixed theme handling when the theme configured doesn't exist (LP: #447733)

467. By Alexander Sack on 2009-10-19

set explicit pycurl TIMEOUT and CONNECTTIMEOUT in facelib __call__

468. By Alexander Sack on 2009-10-21

move OperationResultHandler opdata processing logic into it's own method

469. By Alexander Sack on 2009-10-21

make OperationResultHandler::process_opdata a glib mainloop idle handler to prevent
concurrent access to self.messages and potentially other members

470. By Alexander Sack on 2009-10-21

make a lightweight OperationManager without a threaded scheduler
+ drop scheduler loop code (aka run)
+ make a source callback out of process_scheduled_operation
+ use glib.add_timeout_seconds to schedule operations
+ use glib.remove_source to unschedule operations
+ stop starting operationmanager thread in Microblog constructor

471. By Alexander Sack on 2009-10-22

also make a lightweight/not-threaded OperationResultHandler

+ after this patch all not-blocking operations in gwibber are processed in glib
  main loop; this should reduce the multi-threading problem to the quite well
  confined OperationThread's run method.
+ use OperationResultHandler.process_opdata as glib idle handler for ops
  produced in OperationThread
+ drop all uses of output_queue
+ pass operation result handler to OperationManager constructor now that it
  schedules the proper callback directly
+ accordingly, do not start the Messages result handler in server.py's Microblog
  constructor; instead directly pass it to OperationManager constructor, which
  then will use it as a glib idle handler to run the code in mainloop thread

472. By Alexander Sack on 2009-10-22

fix gwibber not starting if font settings use a non-integer value for size (LP: #383759)
- patch by Krzysztof Klinikowski

473. By Alexander Sack on 2009-10-22

unbreak messages sorting caused by bad flickr time format; use ticks() everywhere

474. By Ken VanDine on 2009-10-22

Fix to match digg API

475. By Ken VanDine on 2009-10-22

* When we quit, shutdown the daemon
* Fixed status icon handling

476. By Ken VanDine on 2009-10-22

Serge Matveenko 2009-10-09 Update Russian translation

[Ken VanDine (ken-vandine)]

Can you please resubmit against trunk again? we had to move branches.

review: Needs Resubmitting

[lp:~ilkka/gwibber/gtk-find-icon-loading-fix]

477. By Alexander Sack on 2009-10-25

rename Laconi.ca to StatusNet (UI part) in laconica.py (thx @BUGabundo for testing) - lp:419817

479. By Ilkka Laukkanen on 2009-10-27

Merged old gtk-find-icon-loading-fix after rebase on mainline r477

Unmerged revisions

479. By Ilkka Laukkanen on 2009-10-27

Merged old gtk-find-icon-loading-fix after rebase on mainline r477

478. By Ilkka Laukkanen on 2009-09-10

Changed default "gtk-find" icon loading to use builtins and bypass
gwibber.resource.load().

477. By Alexander Sack on 2009-10-25

rename Laconi.ca to StatusNet (UI part) in laconica.py (thx @BUGabundo for testing) - lp:419817

476. By Ken VanDine on 2009-10-22

Serge Matveenko 2009-10-09 Update Russian translation

475. By Ken VanDine on 2009-10-22

* When we quit, shutdown the daemon
* Fixed status icon handling

=== modified file 'gwibber/gwui.py'
--- gwibber/gwui.py	2009-09-06 23:48:19 +0000
+++ gwibber/gwui.py	2009-09-10 07:51:13 +0000
@@ -157,13 +157,13 @@
       self.append(None, [n.capitalize(), n, None, None, icon, None, None])
 
     for acct in self.accounts: self.add_account(acct)
-      
-    icon = pbfile(resources.icon("gtk-find", use_theme=False))
+    
+    icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
     self.search_item = self.append(None, ["Search", "search", None, None, icon, None, None])
 
   def add_search(self, query, feature="search"):
     pbfile = gtk.gdk.pixbuf_new_from_file
-    icon = pbfile(resources.icon("gtk-find", use_theme=False))
+    icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
     path = "/gwibber/%s/%s" % (feature, query)
     opid = "search-%s" % query
     ti = self.append(self.search_item, [query, path, None, feature, icon, True, opid])