diff options
| author | Karel Klic <kklic@redhat.com> | 2010-05-04 10:41:35 +0200 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-05-04 10:41:35 +0200 |
| commit | 57845d5f2b1927a13a59cd9800c3b8e9c27e4ef8 (patch) | |
| tree | f06b78c7caabefaa9290e56253925d8b0514ef93 /src | |
| parent | 1b829ea4398c14e679782f3700ad942b40819fbd (diff) | |
| parent | b7f19cfd5afad493a054701fe0f6c8a379d5c3bf (diff) | |
| download | abrt-57845d5f2b1927a13a59cd9800c3b8e9c27e4ef8.tar.gz abrt-57845d5f2b1927a13a59cd9800c3b8e9c27e4ef8.tar.xz abrt-57845d5f2b1927a13a59cd9800c3b8e9c27e4ef8.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/Applet/CCApplet.cpp | 6 | ||||
| -rw-r--r-- | src/Gui/Makefile.am | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp index d890e902..b0da75c7 100644 --- a/src/Applet/CCApplet.cpp +++ b/src/Applet/CCApplet.cpp @@ -83,6 +83,7 @@ static GtkWidget *create_about_dialog() NULL}; const char *artists[] = {"Patrick Connelly <pcon@fedoraproject.org>", + "Lapo Calamandrei", NULL}; const char *comments = _("Notification area applet to notify user about " @@ -141,11 +142,12 @@ CApplet::CApplet(const char* app_name) /* - animation - */ if (m_bIconsLoaded == true) { + //FIXME: animation is disabled for now m_pStatusIcon = gtk_status_icon_new_from_pixbuf(icon_stages_buff[ICON_DEFAULT]); } else { - m_pStatusIcon = gtk_status_icon_new_from_stock(GTK_STOCK_DIALOG_WARNING); + m_pStatusIcon = gtk_status_icon_new_from_icon_name("abrt"); } notify_init(app_name); @@ -417,6 +419,8 @@ void CApplet::stop_animate_icon() bool CApplet::load_icons() { + //FIXME: just a tmp workaround + return false; int stage; for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++) { diff --git a/src/Gui/Makefile.am b/src/Gui/Makefile.am index 15df057c..16c9686e 100644 --- a/src/Gui/Makefile.am +++ b/src/Gui/Makefile.am @@ -10,15 +10,15 @@ PYTHON_FILES = CCDBusBackend.py CCDumpList.py CCDump.py CC_gui_functions.py \ GLADE_FILES = ccgui.glade report.glade settings.glade dialogs.glade settings_wizard.glade -EXTRA_DIST = $(PYTHON_FILES) $(GLADE_FILES) abrt-gui abrt.desktop abrt.png +EXTRA_DIST = $(PYTHON_FILES) $(GLADE_FILES) abrt-gui abrt.desktop #ccguidir = $(pkgdatadir) applicationsdir = $(datadir)/applications applications_DATA = abrt.desktop pkgdata_PYTHON = $(PYTHON_FILES) pkgdata_DATA = $(GLADE_FILES) -pixmapdir = $(datadir)/icons/hicolor/48x48/apps/ -pixmap_DATA = abrt.png +#pixmapdir = $(datadir)/icons/hicolor/48x48/apps/ +#pixmap_DATA = abrt.png CLEANFILES := $(notdir $(wildcard *~)) $(notdir $(wildcard *\#)) $(notdir $(wildcard \.\#*)) $(notdir $(wildcard *.pyc)) |