diff options
Diffstat (limited to 'mateweather')
| -rw-r--r-- | mateweather/Makefile.am | 10 | ||||
| -rw-r--r-- | mateweather/mateweather-about.c | 4 | ||||
| -rw-r--r-- | mateweather/mateweather-applet.c | 4 | ||||
| -rw-r--r-- | mateweather/mateweather-pref.c | 4 | ||||
| -rw-r--r-- | mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in | 2 | ||||
| -rw-r--r-- | mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in | 2 |
6 files changed, 11 insertions, 15 deletions
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am index 9b0e27c0..db2f004c 100644 --- a/mateweather/Makefile.am +++ b/mateweather/Makefile.am @@ -7,14 +7,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\" \ $(MATE_APPLETS4_CFLAGS) \ + $(MATEDESKTOP_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(LIBMATEWEATHER_CFLAGS) \ $(NETWORKMANAGER_CFLAGS) \ $(DBUS_CFLAGS) -libexec_PROGRAMS = mateweather-applet-2 +libexec_PROGRAMS = mateweather-applet -mateweather_applet_2_SOURCES = \ +mateweather_applet_SOURCES = \ mateweather.h \ main.c \ mateweather-about.c mateweather-about.h \ @@ -22,15 +23,16 @@ mateweather_applet_2_SOURCES = \ mateweather-dialog.c mateweather-dialog.h \ mateweather-applet.c mateweather-applet.h -mateweather_applet_2_LDADD = \ +mateweather_applet_LDADD = \ $(LIBNOTIFY_LIBS) \ $(MATE_APPLETS4_LIBS) \ + $(MATEDESKTOP_LIBS) \ $(MATE_LIBS2_LIBS) \ $(LIBMATEWEATHER_LIBS) \ $(NETWORKMANAGER_LIBS) \ $(DBUS_LIBS) -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = mateweather-applet-menu.xml appletdir = $(datadir)/mate-panel/applets diff --git a/mateweather/mateweather-about.c b/mateweather/mateweather-about.c index 424260f7..2fb72b34 100644 --- a/mateweather/mateweather-about.c +++ b/mateweather/mateweather-about.c @@ -18,6 +18,8 @@ #include <stdlib.h> #include <assert.h> +#include <libmate-desktop/mate-aboutdialog.h> + #define MATEWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "mateweather.h" @@ -43,7 +45,7 @@ void mateweather_about_run(MateWeatherApplet* gw_applet) NULL }; - gtk_show_about_dialog(NULL, + mate_show_about_dialog(NULL, "version", VERSION, "copyright", _("\xC2\xA9 1999-2005 by S. Papadimitriou and others"), "comments", _("A panel application for monitoring local weather conditions."), diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c index 6383626b..2c0f55c1 100644 --- a/mateweather/mateweather-applet.c +++ b/mateweather/mateweather-applet.c @@ -343,11 +343,7 @@ void mateweather_applet_create (MateWeatherApplet *gw_applet) G_CALLBACK(size_allocate_cb), gw_applet); g_signal_connect (G_OBJECT(gw_applet->applet), "destroy", G_CALLBACK (applet_destroy), gw_applet); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect (G_OBJECT(gw_applet->applet), "button_press_event", -#else - g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event", -#endif G_CALLBACK(clicked_cb), gw_applet); g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event", G_CALLBACK(key_press_cb), gw_applet); diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 4ac80e8a..672aa8e9 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -789,11 +789,7 @@ static void mateweather_pref_create(MateWeatherPref* pref) GtkWidget* pref_basic_update_alignment; GtkWidget* pref_basic_update_lbl; GtkWidget* pref_basic_update_hbox; -#if GTK_CHECK_VERSION (3, 0, 0) GObject* pref_basic_update_spin_adj; -#else - GtkObject* pref_basic_update_spin_adj; -#endif GtkWidget* pref_basic_update_sec_lbl; GtkWidget* pref_basic_note_lbl; GtkWidget* pref_loc_hbox; diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in index af58a727..c0a1a4f6 100644 --- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in +++ b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=MateWeatherAppletFactory -Location=@LIBEXECDIR@/mateweather-applet-2 +Location=@LIBEXECDIR@/mateweather-applet _Name=Mateweather Applet Factory _Description=Factory for creating the weather applet. diff --git a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in index 2be7b633..e1d0174a 100644 --- a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in +++ b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.MateWeatherAppletFactory -Exec=@LIBEXECDIR@/mateweather-applet-2 +Exec=@LIBEXECDIR@/mateweather-applet |